aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-01-01 11:11:17 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-01-01 11:11:17 +0000
commit311c91775d97f0932231aa114e39a14cfeffef51 (patch)
tree3a3647cf07d4dd0eb60b031c06b8c83fb8687d01 /target/linux/generic-2.6/patches-2.6.30
parentf759c749de09b04d2827cce5e54c88a9a7e9a6d7 (diff)
downloadupstream-311c91775d97f0932231aa114e39a14cfeffef51.tar.gz
upstream-311c91775d97f0932231aa114e39a14cfeffef51.tar.bz2
upstream-311c91775d97f0932231aa114e39a14cfeffef51.zip
kernel: update to 2.6.31.9 and 2.6.32.2, and refresh patches
SVN-Revision: 18982
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch6
1 files changed, 3 insertions, 3 deletions
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 28cc14931c..2c53f03e84 100644
--- 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
*/