diff options
author | David S. Miller <davem@davemloft.net> | 2018-06-26 08:07:17 +0900 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-06-26 08:07:17 +0900 |
commit | 9ff3b40e411c00870d1c29cd6b843fca7c4160ae (patch) | |
tree | 4d58943bf8907f5704ba004fd5383c0d7683c61f /drivers/net/ethernet/hisilicon | |
parent | Merge branch 'r8169-improve-PHY-initialization-and-WoL-handling' (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-dev-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.tar.xz linux-dev-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.zip |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
-rw-r--r-- | drivers/net/ethernet/hisilicon/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig index 8bcf470ff5f3..fb1a7251f45d 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig @@ -5,7 +5,7 @@ config NET_VENDOR_HISILICON bool "Hisilicon devices" default y - depends on (OF || ACPI) && HAS_DMA + depends on OF || ACPI depends on ARM || ARM64 || COMPILE_TEST ---help--- If you have a network (Ethernet) card belonging to this class, say Y. |