[kernel] x86: Sync kernel config

[openwrt.git] / target / linux / ar7 / patches-2.6.25 / 110-flash.patch

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 02f8d95..5f6b8f1 100644 (file)
--- 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.1/drivers/mtd/Kconfig
-===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/Kconfig    2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/drivers/mtd/Kconfig 2008-05-03 16:18:06.000000000 +0200
-@@ -158,6 +158,12 @@
+--- 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,10 +13,8 @@ Index: linux-2.6.25.1/drivers/mtd/Kconfig
  comment "User Modules And Translation Layers"
  
  config MTD_CHAR
-Index: linux-2.6.25.1/drivers/mtd/Makefile
-===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/Makefile   2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/drivers/mtd/Makefile        2008-05-03 16:18:06.000000000 +0200
+--- 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
@@ -27,10 +23,8 @@ Index: linux-2.6.25.1/drivers/mtd/Makefile
  
  # 'Users' - code which presents functionality to userspace.
  obj-$(CONFIG_MTD_CHAR)                += mtdchar.o
-Index: linux-2.6.25.1/drivers/mtd/maps/physmap.c
-===================================================================
---- linux-2.6.25.1.orig/drivers/mtd/maps/physmap.c     2008-05-01 23:45:25.000000000 +0200
-+++ linux-2.6.25.1/drivers/mtd/maps/physmap.c  2008-05-03 16:18:06.000000000 +0200
+--- 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 };