Merge branch 'x2apic' into release

[firefly-linux-kernel-4.4.55.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 5c28b06dac6eabb271ed346aff297b9020be258b..62d732a886f1996954addcc1fa7aadfb0fd56604 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1042,7 +1042,7 @@ config NI65
 
 config DNET
        tristate "Dave ethernet support (DNET)"
-       depends on NET_ETHERNET
+       depends on NET_ETHERNET && HAS_IOMEM
        select PHYLIB
        help
          The Dave ethernet interface (DNET) is found on Qong Board FPGA.
@@ -2630,6 +2630,8 @@ config QLGE
 
 source "drivers/net/sfc/Kconfig"
 
+source "drivers/net/benet/Kconfig"
+
 endif # NETDEV_10000
 
 source "drivers/net/tokenring/Kconfig"