kernel: update to 2.6.31.9 and 2.6.32.2, and refresh patches

[openwrt/svn-archive/archive.git] / target / linux / generic-2.6 / patches-2.6.30 / 020-mips_multi_machine_support.patch

diff --git a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
index 28cc14931cb8587479a573c8e1c5e0eabe89f349..2c53f03e84dd16fa50253540a0437c31db161d20 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch
@@ -127,7 +127,7 @@
 +}
 --- a/arch/mips/kernel/Makefile
 +++ b/arch/mips/kernel/Makefile
-@@ -85,6 +85,7 @@
+@@ -85,6 +85,7 @@ obj-$(CONFIG_GPIO_TXX9)              += gpio_txx9.o
  
  obj-$(CONFIG_KEXEC)           += machine_kexec.o relocate_kernel.o
  obj-$(CONFIG_EARLY_PRINTK)    += early_printk.o
@@ -137,7 +137,7 @@
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -803,6 +803,9 @@
+@@ -803,6 +803,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
  config SYNC_R4K
        bool
  
@@ -157,7 +157,7 @@
  
  unsigned int vced_count, vcei_count;
  
-@@ -33,8 +34,12 @@
+@@ -33,8 +34,12 @@ static int show_cpuinfo(struct seq_file 
        /*
         * For the first processor also print the system type
         */