aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-10-25 01:48:20 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-10-25 01:48:20 +0000
commit531d2b7aae43128c7abfef0194d6e17ce22c1b08 (patch)
treedadc49c82ef3d64b16bb42011e4d435b371e67f5
parent5c483e5e2f8a1d98a0eb55de6f3d90084f714e8f (diff)
downloadupstream-531d2b7aae43128c7abfef0194d6e17ce22c1b08.tar.gz
upstream-531d2b7aae43128c7abfef0194d6e17ce22c1b08.tar.bz2
upstream-531d2b7aae43128c7abfef0194d6e17ce22c1b08.zip
kernel: handle Cavium Octeon Kconfig rename
Upstream commit 9ddebc46 ("MIPS: OCTEON: Rename Kconfig CAVIUM_OCTEON_REFERENCE_BOARD to CAVIUM_OCTEON_SOC") renamed a Kconfig symbol, thus making all MIPS builds ask for this specific Kconfig symbol, add it. Signed-off-by: Florian Fainelli <florian@openwrt.org> SVN-Revision: 38535
-rw-r--r--target/linux/generic/config-3.121
1 files changed, 1 insertions, 0 deletions
diff --git a/target/linux/generic/config-3.12 b/target/linux/generic/config-3.12
index 10f3cbfce3..2d43e6d12d 100644
--- a/target/linux/generic/config-3.12
+++ b/target/linux/generic/config-3.12
@@ -515,6 +515,7 @@ CONFIG_CARDBUS=y
CONFIG_CAVIUM_OCTEON_HELPER=y
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
+# CONFIG_CAVIUM_OCTEON_SOC is not set
# CONFIG_CB710_CORE is not set
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
# CONFIG_CC_STACKPROTECTOR is not set