aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
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
commite14288c63279c15e1110d383b396fb7e3dfff6e6 (patch)
treee4675335f3b2fbec83dba4c0c13c82f81d475919 /target/linux
parent1596af3c541496d7ec40f62aadfac2ee499488c2 (diff)
downloadmaster-187ad058-e14288c63279c15e1110d383b396fb7e3dfff6e6.tar.gz
master-187ad058-e14288c63279c15e1110d383b396fb7e3dfff6e6.tar.bz2
master-187ad058-e14288c63279c15e1110d383b396fb7e3dfff6e6.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38535 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-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