X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm47xx%2Fpatches-2.6.25%2F110-flash_map.patch;h=6d3161c86de552f18d7fec7b4c77ee9262f15901;hb=16a90e9d52979c6b83ce87075b0f989b442c9549;hp=3c16831f68206de429c123bf8d54a2d3e83855ce;hpb=17bba1a8f677463d167bff354036fb3f0f04160e;p=openwrt-10.03%2F.git

diff --git a/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch b/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
index 3c16831f6..6d3161c86 100644
--- a/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.25.4/drivers/mtd/maps/Kconfig
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
 @@ -337,6 +337,12 @@ config MTD_CFI_FLAGADM
  	  Mapping for the Flaga digital module. If you don't have one, ignore
  	  this setting.
@@ -15,10 +13,8 @@ Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
  config MTD_WALNUT
  	tristate "Flash device mapped on IBM 405GP Walnut"
  	depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
-Index: linux-2.6.25.4/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.25.4/drivers/mtd/maps/Makefile
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
 @@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm
  obj-$(CONFIG_MTD_PCMCIA)	+= pcmciamtd.o
  obj-$(CONFIG_MTD_RPXLITE)	+= rpxlite.o