summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/hisilicon
diff options
context:
space:
mode:
authorKejian Yan2016-06-13 10:56:20 +0200
committerDavid S. Miller2016-06-15 08:28:42 +0200
commit4a63538ef1ccfec7716e255b67b57080d11fa670 (patch)
tree33c4e54f19429076661aaf80a18b3d82f4183ee6 /drivers/net/ethernet/hisilicon
parentMerge branch 'r8152-phy-adjustments' (diff)
downloadkernel-qcow2-linux-4a63538ef1ccfec7716e255b67b57080d11fa670.tar.gz
kernel-qcow2-linux-4a63538ef1ccfec7716e255b67b57080d11fa670.tar.xz
kernel-qcow2-linux-4a63538ef1ccfec7716e255b67b57080d11fa670.zip
net: hns: update the dependency
After the patchset about adding support of ACPI (commit id is 6343488) being applied, HNS does not depend on OF. It depends on OF or ACPI, so the Kconfig file needs to be updated. Signed-off-by: Kejian Yan <yankejian@huawei.com> Signed-off-by: Yisen Zhuang <Yisen.Zhuang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/hisilicon')
-rw-r--r--drivers/net/ethernet/hisilicon/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig
index 4ccc032633c4..2e2566230e27 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 && HAS_DMA
+ depends on (OF || ACPI) && HAS_DMA
depends on ARM || ARM64 || COMPILE_TEST
---help---
If you have a network (Ethernet) card belonging to this class, say Y.