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/arc/Kconfig | |
parent | 823819507095135b475a99048f0b0b6e75580fbc (diff) | |
parent | 6f0d349d922ba44e4348a17a78ea51b7135965b1 (diff) | |
download | talos-op-linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.tar.gz talos-op-linux-9ff3b40e411c00870d1c29cd6b843fca7c4160ae.zip |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/ethernet/arc/Kconfig')
-rw-r--r-- | drivers/net/ethernet/arc/Kconfig | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/arc/Kconfig b/drivers/net/ethernet/arc/Kconfig index e743ddf46343..5d0ab8e74b68 100644 --- a/drivers/net/ethernet/arc/Kconfig +++ b/drivers/net/ethernet/arc/Kconfig @@ -24,7 +24,8 @@ config ARC_EMAC_CORE config ARC_EMAC tristate "ARC EMAC support" select ARC_EMAC_CORE - depends on OF_IRQ && OF_NET && HAS_DMA && (ARC || COMPILE_TEST) + depends on OF_IRQ && OF_NET + depends on ARC || COMPILE_TEST ---help--- On some legacy ARC (Synopsys) FPGA boards such as ARCAngel4/ML50x non-standard on-chip ethernet device ARC EMAC 10/100 is used. @@ -33,7 +34,8 @@ config ARC_EMAC config EMAC_ROCKCHIP tristate "Rockchip EMAC support" select ARC_EMAC_CORE - depends on OF_IRQ && OF_NET && REGULATOR && HAS_DMA && (ARCH_ROCKCHIP || COMPILE_TEST) + depends on OF_IRQ && OF_NET && REGULATOR + depends on ARCH_ROCKCHIP || COMPILE_TEST ---help--- Support for Rockchip RK3036/RK3066/RK3188 EMAC ethernet controllers. This selects Rockchip SoC glue layer support for the |