diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
| commit | c92885c466d11dc3b8e2837a8be1fd3b6b7e2e01 (patch) | |
| tree | 1a38200fe1a33cb965650ca687167175938fbedd /target/linux/magicbox-2.6/patches/002-flash_map.patch | |
| parent | a8131d463830012d225fa1032222c3a38b168778 (diff) | |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/magicbox-2.6/patches/002-flash_map.patch')
| -rw-r--r-- | target/linux/magicbox-2.6/patches/002-flash_map.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/magicbox-2.6/patches/002-flash_map.patch b/target/linux/magicbox-2.6/patches/002-flash_map.patch index e5f803a14..5d29a047d 100644 --- a/target/linux/magicbox-2.6/patches/002-flash_map.patch +++ b/target/linux/magicbox-2.6/patches/002-flash_map.patch @@ -43,7 +43,7 @@ diff -urN linux.old/drivers/mtd/maps/magicmap.c linux.dev/drivers/mtd/maps/magic +#include <linux/mtd/mtd.h> +#include <linux/mtd/map.h> +#include <linux/mtd/partitions.h> -+#include <linux/config.h> ++#include <linux/autoconf.h> +#include <asm/io.h> + +static struct mtd_info *flash; @@ -91,7 +91,7 @@ diff -urN linux.old/drivers/mtd/maps/magicmap.c linux.dev/drivers/mtd/maps/magic + flash = do_map_probe("cfi_probe", &magic_map); + if (flash) { + flash->owner = THIS_MODULE; -+ if (MTD_READ(flash, 12, sizeof(u32), &len, (char *) &size) || ++ if (flash->read(flash, 12, sizeof(u32), &len, (char *) &size) || + len != 4) + return -ENXIO; + size += 0x40; /* header size of the uImage */ |