[x86] add olpc 2.6.31 configuration, forward port the block2mtd patch, refresh patches

[openwrt.git] / target / linux / s3c24xx / patches-2.6.30 / 068-ar6000.patch

diff --git a/target/linux/s3c24xx/patches-2.6.30/068-ar6000.patch b/target/linux/s3c24xx/patches-2.6.30/068-ar6000.patch
index 71357cf..d5565ef 100644 (file)
--- a/target/linux/s3c24xx/patches-2.6.30/068-ar6000.patch
+++ b/target/linux/s3c24xx/patches-2.6.30/068-ar6000.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.30-rc6/arch/arm/Kconfig
-===================================================================
---- linux-2.6.30-rc6.orig/arch/arm/Kconfig     2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/arch/arm/Kconfig  2009-05-18 19:08:34.000000000 +0200
-@@ -1401,6 +1401,8 @@
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -1401,6 +1401,8 @@ source "drivers/usb/Kconfig"
  
  source "drivers/uwb/Kconfig"
  
@@ -11,11 +9,9 @@ Index: linux-2.6.30-rc6/arch/arm/Kconfig
  source "drivers/mmc/Kconfig"
  
  source "drivers/memstick/Kconfig"
-Index: linux-2.6.30-rc6/drivers/Makefile
-===================================================================
---- linux-2.6.30-rc6.orig/drivers/Makefile     2009-05-16 06:12:57.000000000 +0200
-+++ linux-2.6.30-rc6/drivers/Makefile  2009-05-18 19:08:34.000000000 +0200
-@@ -91,6 +91,7 @@
+--- a/drivers/Makefile
++++ b/drivers/Makefile
+@@ -91,6 +91,7 @@ obj-$(CONFIG_CPU_IDLE)               += cpuidle/
  obj-y                         += idle/
  obj-$(CONFIG_MMC)             += mmc/
  obj-$(CONFIG_MEMSTICK)                += memstick/