diff options
| author |   Geert Uytterhoeven <geert@linux-m68k.org> | 2015-06-26 14:08:22 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2015-06-28 20:20:55 -0700 |
| commit | 0f8b6cea1f3271ccc37dd2847b39e235461e0ced (patch) | |
| tree | f273d78ceba506b16e6e52fe74e3a4af9beb7ff8 /drivers/net/ethernet/via/Kconfig | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue (diff) | |
| download | linux-dev-0f8b6cea1f3271ccc37dd2847b39e235461e0ced.tar.xz linux-dev-0f8b6cea1f3271ccc37dd2847b39e235461e0ced.zip | |
net: via: VIA_RHINE and VIA_VELOCITY should depend on HAS_DMA
If NO_DMA=y:
ERROR: "dma_sync_single_for_cpu" [drivers/net/ethernet/via/via-rhine.ko] undefined!
ERROR: "dma_set_mask" [drivers/net/ethernet/via/via-rhine.ko] undefined!
ERROR: "dma_mapping_error" [drivers/net/ethernet/via/via-rhine.ko] undefined!
ERROR: "dma_map_single" [drivers/net/ethernet/via/via-rhine.ko] undefined!
ERROR: "dma_alloc_coherent" [drivers/net/ethernet/via/via-rhine.ko] undefined!
ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-rhine.ko] undefined!
ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-rhine.ko] undefined!
ERROR: "dma_map_page" [drivers/net/ethernet/via/via-velocity.ko] undefined!
ERROR: "dma_sync_single_for_cpu" [drivers/net/ethernet/via/via-velocity.ko] undefined!
ERROR: "dma_free_coherent" [drivers/net/ethernet/via/via-velocity.ko] undefined!
ERROR: "dma_unmap_single" [drivers/net/ethernet/via/via-velocity.ko] undefined!
ERROR: "dma_map_single" [drivers/net/ethernet/via/via-velocity.ko] undefined!
ERROR: "dma_alloc_coherent" [drivers/net/ethernet/via/via-velocity.ko] undefined!
Before, the symbols depended implicitly on HAS_DMA through PCI or
USE_OF. Add explicit dependencies on HAS_DMA to fix this.
Fixes: b7d3282a245f4428 ("net: via/Kconfig: replace USE_OF with OF_???")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/via/Kconfig')
| -rw-r--r-- | drivers/net/ethernet/via/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/via/Kconfig b/drivers/net/ethernet/via/Kconfig index 8b0b1d6aca72..2f1264b882b9 100644 --- a/drivers/net/ethernet/via/Kconfig +++ b/drivers/net/ethernet/via/Kconfig @@ -18,6 +18,7 @@ if NET_VENDOR_VIA config VIA_RHINE tristate "VIA Rhine support" depends on (PCI || OF_IRQ) + depends on HAS_DMA select CRC32 select MII ---help--- @@ -42,6 +43,7 @@ config VIA_RHINE_MMIO config VIA_VELOCITY tristate "VIA Velocity support" depends on (PCI || (OF_ADDRESS && OF_IRQ)) + depends on HAS_DMA select CRC32 select CRC_CCITT select MII |