aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-10-05 08:50:54 +0000
commit76f0b54cd5e718183374acb8bd4e0e00eb91ca17 (patch)
tree0c8716c5e67d2f8142dc9e18a5bac307c709c041 /target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch
parent3784ca2da7f11cd7f8301e52a475459331a8fc5a (diff)
downloadupstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.gz
upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.tar.bz2
upstream-76f0b54cd5e718183374acb8bd4e0e00eb91ca17.zip
linux/generic: refresh 2.6.36 kernel patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23237 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch')
-rw-r--r--target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch6
1 files changed, 3 insertions, 3 deletions
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 ca0c10b20d..be9b7c3211 100644
--- 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
+@@ -874,6 +874,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
*/