summaryrefslogtreecommitdiffstats
path: root/arch/mips/cavium-octeon/Kconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-10-12 21:38:02 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-10-12 21:38:02 -0600
commit492c032beccd53f807811b6c14909630d409dd8c (patch)
tree208550c6ccecb8f1b4f85edb91702ca2bdef855e /arch/mips/cavium-octeon/Kconfig
parentf9d629c737cb6687216a0c540b5466a4bd8b070a (diff)
parentcb655d0f3d57c23db51b981648e452988c0223f9 (diff)
downloadtalos-op-linux-492c032beccd53f807811b6c14909630d409dd8c.tar.gz
talos-op-linux-492c032beccd53f807811b6c14909630d409dd8c.zip
Merge commit 'v2.6.36-rc7' into spi/next
Diffstat (limited to 'arch/mips/cavium-octeon/Kconfig')
-rw-r--r--arch/mips/cavium-octeon/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/cavium-octeon/Kconfig b/arch/mips/cavium-octeon/Kconfig
index 094c17e38e16..47323ca452dc 100644
--- a/arch/mips/cavium-octeon/Kconfig
+++ b/arch/mips/cavium-octeon/Kconfig
@@ -83,3 +83,7 @@ config ARCH_SPARSEMEM_ENABLE
def_bool y
select SPARSEMEM_STATIC
depends on CPU_CAVIUM_OCTEON
+
+config CAVIUM_OCTEON_HELPER
+ def_bool y
+ depends on OCTEON_ETHERNET || PCI
OpenPOWER on IntegriCloud