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.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
dbox2-flash.c
diff --git
a/drivers/mtd/maps/dbox2-flash.c
b/drivers/mtd/maps/dbox2-flash.c
index
6565afb
..
7c4de43
100644
(file)
--- a/
drivers/mtd/maps/dbox2-flash.c
+++ b/
drivers/mtd/maps/dbox2-flash.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: dbox2-flash.c,v 1.
9 2003/05/21 12:45:18
dwmw2 Exp $
+ * $Id: dbox2-flash.c,v 1.
11 2004/07/12 21:59:43
dwmw2 Exp $
*
* D-Box 2 flash driver
*/
*
* D-Box 2 flash driver
*/
@@
-13,6
+13,7
@@
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/config.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/config.h>
+#include <linux/errno.h>
/* partition_info gives details on the logical partitions that the split the
* single flash device into. If the size if zero we use up to the end of the
/* partition_info gives details on the logical partitions that the split the
* single flash device into. If the size if zero we use up to the end of the
@@
-25,31
+26,31
@@
static struct mtd_partition partition_info[]= {
.mask_flags = MTD_WRITEABLE
},
{
.mask_flags = MTD_WRITEABLE
},
{
- .name = "
flfs (ppcb
oot)",
+ .name = "
FLFS (U-B
oot)",
.size = 128 * 1024,
.offset = MTDPART_OFS_APPEND,
.mask_flags = 0
},
{
.size = 128 * 1024,
.offset = MTDPART_OFS_APPEND,
.mask_flags = 0
},
{
- .name = "
root (cramfs)",
+ .name = "
Root (SquashFS)",
.size = 7040 * 1024,
.offset = MTDPART_OFS_APPEND,
.mask_flags = 0
},
{
.size = 7040 * 1024,
.offset = MTDPART_OFS_APPEND,
.mask_flags = 0
},
{
- .name = "var (
jffs
2)",
+ .name = "var (
JFFS
2)",
.size = 896 * 1024,
.offset = MTDPART_OFS_APPEND,
.mask_flags = 0
},
{
.size = 896 * 1024,
.offset = MTDPART_OFS_APPEND,
.mask_flags = 0
},
{
- .name = "
f
lash without bootloader",
+ .name = "
F
lash without bootloader",
.size = MTDPART_SIZ_FULL,
.offset = 128 * 1024,
.mask_flags = 0
},
{
.size = MTDPART_SIZ_FULL,
.offset = 128 * 1024,
.mask_flags = 0
},
{
- .name = "
complete f
lash",
+ .name = "
Complete F
lash",
.size = MTDPART_SIZ_FULL,
.offset = 0,
.mask_flags = MTD_WRITEABLE
.size = MTDPART_SIZ_FULL,
.offset = 0,
.mask_flags = MTD_WRITEABLE
@@
-67,7
+68,7
@@
static struct mtd_info *mymtd;
struct map_info dbox2_flash_map = {
.name = "D-Box 2 flash memory",
.size = WINDOW_SIZE,
struct map_info dbox2_flash_map = {
.name = "D-Box 2 flash memory",
.size = WINDOW_SIZE,
- .b
uswidth
= 4,
+ .b
ankwidth
= 4,
.phys = WINDOW_ADDR,
};
.phys = WINDOW_ADDR,
};
@@
-86,7
+87,7
@@
int __init init_dbox2_flash(void)
mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
if (!mymtd) {
// Probe for single Intel 28F640
mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
if (!mymtd) {
// Probe for single Intel 28F640
- dbox2_flash_map.b
us
width = 2;
+ dbox2_flash_map.b
ank
width = 2;
mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
}
mymtd = do_map_probe("cfi_probe", &dbox2_flash_map);
}