git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
sa1100-flash.c
diff --git
a/drivers/mtd/maps/sa1100-flash.c
b/drivers/mtd/maps/sa1100-flash.c
index
c42ca6f
..
bb9c077
100644
(file)
--- a/
drivers/mtd/maps/sa1100-flash.c
+++ b/
drivers/mtd/maps/sa1100-flash.c
@@
-885,7
+885,7
@@
struct sa_info {
unsigned long base;
unsigned long size;
int width;
unsigned long base;
unsigned long size;
int width;
- void *vbase;
+ void
__iomem
*vbase;
void (*set_vpp)(struct map_info *, int);
struct map_info *map;
struct mtd_info *mtd;
void (*set_vpp)(struct map_info *, int);
struct map_info *map;
struct mtd_info *mtd;
@@
-932,7
+932,7
@@
static int __init sa1100_setup_mtd(struct sa_info *sa, int nr, struct mtd_info *
break;
}
break;
}
- sa[i].map->virt =
(unsigned long)
sa[i].vbase;
+ sa[i].map->virt = sa[i].vbase;
sa[i].map->phys = sa[i].base;
sa[i].map->set_vpp = sa[i].set_vpp;
sa[i].map->bankwidth = sa[i].width;
sa[i].map->phys = sa[i].base;
sa[i].map->set_vpp = sa[i].set_vpp;
sa[i].map->bankwidth = sa[i].width;