From 115a129a30ab1a50d62f8efac868db2380909624 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 26 Jul 2008 10:53:23 +0000 Subject: [kernel] update to 2.6.25.12 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11933 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../at91/patches-2.6.25/007-mtd-partition.patch | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) (limited to 'target/linux/at91/patches-2.6.25/007-mtd-partition.patch') diff --git a/target/linux/at91/patches-2.6.25/007-mtd-partition.patch b/target/linux/at91/patches-2.6.25/007-mtd-partition.patch index 5c0cd3ec62..80602596ad 100644 --- a/target/linux/at91/patches-2.6.25/007-mtd-partition.patch +++ b/target/linux/at91/patches-2.6.25/007-mtd-partition.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c -=================================================================== ---- linux-2.6.22.19.orig/drivers/mtd/devices/at91_dataflash.c -+++ linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c -@@ -175,7 +175,7 @@ static struct mtd_partition static_parti +--- a/drivers/mtd/devices/at91_dataflash.c ++++ b/drivers/mtd/devices/at91_dataflash.c +@@ -175,7 +175,7 @@ }; #endif @@ -11,13 +9,11 @@ Index: linux-2.6.22.19/drivers/mtd/devices/at91_dataflash.c #endif -Index: linux-2.6.22.19/drivers/mtd/Kconfig -=================================================================== ---- linux-2.6.22.19.orig/drivers/mtd/Kconfig -+++ linux-2.6.22.19/drivers/mtd/Kconfig -@@ -168,6 +168,12 @@ config MTD_AFS_PARTS - the partition map from the children of the flash node, - as described in Documentation/powerpc/booting-without-of.txt. +--- 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. +config MTD_AT91_PARTS + tristate "Atmel AT91 partitioning support" @@ -28,11 +24,9 @@ Index: linux-2.6.22.19/drivers/mtd/Kconfig comment "User Modules And Translation Layers" config MTD_CHAR -Index: linux-2.6.22.19/drivers/mtd/Makefile -=================================================================== ---- linux-2.6.22.19.orig/drivers/mtd/Makefile -+++ linux-2.6.22.19/drivers/mtd/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o +--- 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 -- cgit v1.2.3