diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-01-01 11:11:17 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-01-01 11:11:17 +0000 |
| commit | 78385ba038013e2848b7ac89f910d5ecbf0c7bae (patch) | |
| tree | 0ed3383182610a1dbeb59ebe38d0d7b3876300ec /target/linux/generic-2.6/patches-2.6.30 | |
| parent | 8d305a4b62e917b6375ede8f6229405563203ca8 (diff) | |
| download | master-187ad058-78385ba038013e2848b7ac89f910d5ecbf0c7bae.tar.gz master-187ad058-78385ba038013e2848b7ac89f910d5ecbf0c7bae.tar.bz2 master-187ad058-78385ba038013e2848b7ac89f910d5ecbf0c7bae.zip | |
kernel: update to 2.6.31.9 and 2.6.32.2, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18982 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch | 6 |
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 */ |