kernel: reorganize 2.6.37 patches

[openwrt.git] / target / linux / generic / patches-2.6.36 / 020-mips_multi_machine_support.patch

diff --git a/target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch b/target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
index ca0c10b20dbbcf35f71f402f8b4b219f167a3ea7..64b978197643722eaa77f64d453776f99fb549d5 100644 (file)
--- a/target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
+++ b/target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
@@ -146,7 +146,7 @@
 +}
 --- a/arch/mips/kernel/Makefile
 +++ b/arch/mips/kernel/Makefile
-@@ -94,6 +94,7 @@ obj-$(CONFIG_GPIO_TXX9)              += gpio_txx9.o
+@@ -95,6 +95,7 @@ obj-$(CONFIG_GPIO_TXX9)              += gpio_txx9.o
  obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o
  obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
  obj-$(CONFIG_SPINLOCK_TEST)   += spinlock_test.o
@@ -156,7 +156,7 @@
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -853,6 +853,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
+@@ -875,6 +875,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
  config SYNC_R4K
        bool