kernel: backport some ssb changes to support a mac80211 update

[openwrt/svn-archive/archive.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 be9b7c321190f605f882a4ac5efc19073b8115cf..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
@@ -156,7 +156,7 @@
  
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -874,6 +874,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
+@@ -875,6 +875,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
  config SYNC_R4K
        bool
  
@@ -176,7 +176,7 @@
  
  unsigned int vced_count, vcei_count;
  
-@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file
+@@ -31,8 +32,12 @@ static int show_cpuinfo(struct seq_file 
        /*
         * For the first processor also print the system type
         */