aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.26/110-flash.patch
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-11-06 20:55:33 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-11-06 20:55:33 +0000
commita1bf28950d16ca97897a524dc74ec0e52ef08fff (patch)
treecc582d4bee75a51b8c5a23ff3cef3b18f1739362 /target/linux/ar7/patches-2.6.26/110-flash.patch
parent2c638cf43bb61b33f581bd057441418a30b39dc4 (diff)
downloadupstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.tar.gz
upstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.tar.bz2
upstream-a1bf28950d16ca97897a524dc74ec0e52ef08fff.zip
refresh 2.6.26 patches
SVN-Revision: 13135
Diffstat (limited to 'target/linux/ar7/patches-2.6.26/110-flash.patch')
-rw-r--r--target/linux/ar7/patches-2.6.26/110-flash.patch6
1 files changed, 3 insertions, 3 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 4740e3421e..bda6e3727c 100644
--- a/target/linux/ar7/patches-2.6.26/110-flash.patch
+++ b/target/linux/ar7/patches-2.6.26/110-flash.patch
@@ -1,6 +1,6 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
-@@ -174,6 +174,12 @@
+@@ -174,6 +174,12 @@ config MTD_AR7_PARTS
---help---
TI AR7 partitioning support
@@ -15,7 +15,7 @@
config MTD_CHAR
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
-@@ -13,6 +13,7 @@
+@@ -13,6 +13,7 @@ obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdli
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
@@ -25,7 +25,7 @@
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
-@@ -87,7 +87,8 @@
+@@ -87,7 +87,8 @@ static int physmap_flash_remove(struct p
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
#ifdef CONFIG_MTD_PARTITIONS