summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.25/110-flash.patch
diff options
context:
space:
mode:
authorMatteo Croce <rootkit85@yahoo.it>2008-06-12 22:33:48 +0000
committerMatteo Croce <rootkit85@yahoo.it>2008-06-12 22:33:48 +0000
commitd1c097e3d033d1f8545d8a9b5ae82a224434a475 (patch)
tree3af6b947e2feaedcc7416dd5f5df01d485cc099e /target/linux/ar7/patches-2.6.25/110-flash.patch
parente8a8d5811d8e3716a0f66769242ab564c4d00d14 (diff)
downloadmaster-31e0f0ae-d1c097e3d033d1f8545d8a9b5ae82a224434a475.tar.gz
master-31e0f0ae-d1c097e3d033d1f8545d8a9b5ae82a224434a475.tar.bz2
master-31e0f0ae-d1c097e3d033d1f8545d8a9b5ae82a224434a475.zip
ar7: refresh patches
SVN-Revision: 11452
Diffstat (limited to 'target/linux/ar7/patches-2.6.25/110-flash.patch')
-rw-r--r--target/linux/ar7/patches-2.6.25/110-flash.patch24
1 files changed, 9 insertions, 15 deletions
diff --git a/target/linux/ar7/patches-2.6.25/110-flash.patch b/target/linux/ar7/patches-2.6.25/110-flash.patch
index 350fe167f5..5f6b8f1df8 100644
--- a/target/linux/ar7/patches-2.6.25/110-flash.patch
+++ b/target/linux/ar7/patches-2.6.25/110-flash.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/Kconfig
-+++ linux-2.6.25.4/drivers/mtd/Kconfig
-@@ -168,6 +168,12 @@ config MTD_OF_PARTS
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -168,6 +168,12 @@
the partition map from the children of the flash node,
as described in Documentation/powerpc/booting-without-of.txt.
@@ -15,11 +13,9 @@ Index: linux-2.6.25.4/drivers/mtd/Kconfig
comment "User Modules And Translation Layers"
config MTD_CHAR
-Index: linux-2.6.25.4/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/Makefile
-+++ linux-2.6.25.4/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
+@@ -12,6 +12,7 @@
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
@@ -27,11 +23,9 @@ Index: linux-2.6.25.4/drivers/mtd/Makefile
# 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
-Index: linux-2.6.25.4/drivers/mtd/maps/physmap.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/physmap.c
-+++ linux-2.6.25.4/drivers/mtd/maps/physmap.c
-@@ -87,7 +87,8 @@ static int physmap_flash_remove(struct p
+--- a/drivers/mtd/maps/physmap.c
++++ b/drivers/mtd/maps/physmap.c
+@@ -87,7 +87,8 @@
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
#ifdef CONFIG_MTD_PARTITIONS