aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/octeon/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-10-27 11:00:19 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-10-27 11:00:19 -0700
commit728d90bdc9e480dc93913e59a0aa3c896c7aa697 (patch)
tree258b1b6ee711f0ef67fd225700d84eccec285194 /drivers/staging/octeon/Kconfig
parentInput: adp5589 - make keypad support optional (diff)
parentLinux 5.4-rc5 (diff)
downloadlinux-dev-728d90bdc9e480dc93913e59a0aa3c896c7aa697.tar.xz
linux-dev-728d90bdc9e480dc93913e59a0aa3c896c7aa697.zip
Merge tag 'v5.4-rc5' into next
Sync up with mainline.
Diffstat (limited to 'drivers/staging/octeon/Kconfig')
-rw-r--r--drivers/staging/octeon/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/octeon/Kconfig b/drivers/staging/octeon/Kconfig
index 1e3012b9991c..5319909eb2f6 100644
--- a/drivers/staging/octeon/Kconfig
+++ b/drivers/staging/octeon/Kconfig
@@ -1,7 +1,8 @@
# SPDX-License-Identifier: GPL-2.0
config OCTEON_ETHERNET
tristate "Cavium Networks Octeon Ethernet support"
- depends on CAVIUM_OCTEON_SOC && NETDEVICES
+ depends on CAVIUM_OCTEON_SOC || COMPILE_TEST
+ depends on NETDEVICES
select PHYLIB
select MDIO_OCTEON
help