diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-10-05 08:50:54 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-10-05 08:50:54 +0000 |
commit | 11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da (patch) | |
tree | cdfe45082cf11d9c3d0d51f1315c08b833b4813f /target/linux/generic/patches-2.6.36/020-mips_multi_machine_support.patch | |
parent | 978ecae6855efdd2806c2975b85b22c9b2833862 (diff) | |
download | upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.gz upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.tar.bz2 upstream-11c45f64fe699fc2dd97fa1a0015f28a7ba4f4da.zip |
linux/generic: refresh 2.6.36 kernel patches
SVN-Revision: 23237
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.patch | 6 |
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 */ |