Merge tag 'upstream-3.14-rc1' of git://git.infradead.org/linux-ubifs

[~andy/linux] / drivers / staging / octeon / Kconfig

diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig
index 9493128e5fd2d7a743521781eddcd507622310a2..6e1d5f8d3ec1a7c02be293aa9ffd195d63ceff29 100644 (file)
--- a/drivers/staging/octeon/Kconfig
+++ b/drivers/staging/octeon/Kconfig
@@ -1,6 +1,6 @@
 config OCTEON_ETHERNET
        tristate "Cavium Networks Octeon Ethernet support"
-       depends on CPU_CAVIUM_OCTEON && NETDEVICES
+       depends on CAVIUM_OCTEON_SOC && NETDEVICES
        select PHYLIB
        select MDIO_OCTEON
        help