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
/
edb7312.c
diff --git
a/drivers/mtd/maps/edb7312.c
b/drivers/mtd/maps/edb7312.c
index
0ecac20
..
b7fd849
100644
(file)
--- a/
drivers/mtd/maps/edb7312.c
+++ b/
drivers/mtd/maps/edb7312.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: edb7312.c,v 1.
9 2003/06/23 11:48:18
dwmw2 Exp $
+ * $Id: edb7312.c,v 1.
11 2004/07/14 09:52:55
dwmw2 Exp $
*
* Handle mapping of the NOR flash on Cogent EDB7312 boards
*
*
* Handle mapping of the NOR flash on Cogent EDB7312 boards
*
@@
-28,8
+28,8
@@
#define BUSWIDTH 2
#define FLASH_BLOCKSIZE_MAIN 0x20000
#define FLASH_NUMBLOCKS_MAIN 128
#define BUSWIDTH 2
#define FLASH_BLOCKSIZE_MAIN 0x20000
#define FLASH_NUMBLOCKS_MAIN 128
-/* can be "cfi_probe", "jedec_probe", "map_rom",
0
}; */
-#define PROBETYPES { "cfi_probe",
0
}
+/* can be "cfi_probe", "jedec_probe", "map_rom",
NULL
}; */
+#define PROBETYPES { "cfi_probe",
NULL
}
#define MSG_PREFIX "EDB7312-NOR:" /* prefix for our printk()'s */
#define MTDID "edb7312-nor" /* for mtdparts= partitioning */
#define MSG_PREFIX "EDB7312-NOR:" /* prefix for our printk()'s */
#define MTDID "edb7312-nor" /* for mtdparts= partitioning */
@@
-39,7
+39,7
@@
static struct mtd_info *mymtd;
struct map_info edb7312nor_map = {
.name = "NOR flash on EDB7312",
.size = WINDOW_SIZE,
struct map_info edb7312nor_map = {
.name = "NOR flash on EDB7312",
.size = WINDOW_SIZE,
- .b
us
width = BUSWIDTH,
+ .b
ank
width = BUSWIDTH,
.phys = WINDOW_ADDR,
};
.phys = WINDOW_ADDR,
};
@@
-71,14
+71,14
@@
static const char *probes[] = { "RedBoot", "cmdlinepart", NULL };
#endif
#endif
-static int
mtd_parts_nb = 0
;
-static struct mtd_partition *mtd_parts
= 0
;
+static int
mtd_parts_nb
;
+static struct mtd_partition *mtd_parts;
int __init init_edb7312nor(void)
{
static const char *rom_probe_types[] = PROBETYPES;
const char **type;
int __init init_edb7312nor(void)
{
static const char *rom_probe_types[] = PROBETYPES;
const char **type;
- const char *part_type =
0
;
+ const char *part_type =
NULL
;
printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n",
WINDOW_SIZE, WINDOW_ADDR);
printk(KERN_NOTICE MSG_PREFIX "0x%08x at 0x%08x\n",
WINDOW_SIZE, WINDOW_ADDR);
@@
-92,7
+92,7
@@
int __init init_edb7312nor(void)
simple_map_init(&edb7312nor_map);
simple_map_init(&edb7312nor_map);
- mymtd =
0
;
+ mymtd =
NULL
;
type = rom_probe_types;
for(; !mymtd && *type; type++) {
mymtd = do_map_probe(*type, &edb7312nor_map);
type = rom_probe_types;
for(; !mymtd && *type; type++) {
mymtd = do_map_probe(*type, &edb7312nor_map);