aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-12-06 09:19:05 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-12-06 09:19:05 +0000
commitd5bfba98ceffac8d4d6e1d3b503e3fec149eed03 (patch)
tree612034bd2284790009b1688c579bbb21400250eb /target/linux
parent6316779786db1c6f06cb2830f38ba52d8946727f (diff)
downloadupstream-d5bfba98ceffac8d4d6e1d3b503e3fec149eed03.tar.gz
upstream-d5bfba98ceffac8d4d6e1d3b503e3fec149eed03.tar.bz2
upstream-d5bfba98ceffac8d4d6e1d3b503e3fec149eed03.zip
refresh 2.6.26 patches
SVN-Revision: 13527
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar7/patches-2.6.26/110-flash.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ar7/patches-2.6.26/110-flash.patch b/target/linux/ar7/patches-2.6.26/110-flash.patch
index 51b57f7986..43e0c93fa9 100644
--- a/target/linux/ar7/patches-2.6.26/110-flash.patch
+++ b/target/linux/ar7/patches-2.6.26/110-flash.patch
@@ -1,8 +1,8 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -174,6 +174,12 @@ config MTD_AR7_PARTS
- ---help---
- TI AR7 partitioning support
+@@ -190,6 +190,12 @@ config MTD_MYLOADER_PARTS
+ You will still need the parsing functions to be called by the driver
+ for your particular device. It won't happen automatically.
+config MTD_AR7_PARTS
+ tristate "TI AR7 partitioning support"
@@ -15,7 +15,7 @@
config MTD_CHAR
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ static int physmap_flash_remove(struct p
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
#ifdef CONFIG_MTD_PARTITIONS