summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-10-24 13:05:22 +0000
commiteb0c0200624c487af549aca9eddb722413dbc1cd (patch)
treeb152afa6fd38537133c7a67e6aeff8476342d5a0 /target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch
parent8b3c85ca8244eec0d01eea269922d780f73ccebb (diff)
[kernel] make all 3.6 patches apply and build
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch')
-rw-r--r--target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch
index b114ef404..e74803dff 100644
--- a/target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch
+++ b/target/linux/generic/patches-3.6/300-mips_expose_boot_raw.patch
@@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net>
---
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -877,9 +877,6 @@ config ARC
+@@ -894,9 +894,6 @@ config ARC
config ARCH_MAY_HAVE_PC_FDC
bool
@@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net>
config CEVT_BCM1480
bool
-@@ -2330,6 +2327,18 @@ config USE_OF
+@@ -2367,6 +2364,18 @@ config USE_OF
help
Include support for flattened device tree machine descriptions.