diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-06-26 08:08:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-28 23:20:55 -0400 |
| commit | 0f8b6cea1f3271ccc37dd2847b39e235461e0ced (patch) | |
| tree | f273d78ceba506b16e6e52fe74e3a4af9beb7ff8 | |
| parent | ebc032391c814a12cb13813b741a00bfb8617b75 (diff) | |
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>
| -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 | |||
| 18 | config VIA_RHINE | 18 | config VIA_RHINE |
| 19 | tristate "VIA Rhine support" | 19 | tristate "VIA Rhine support" |
| 20 | depends on (PCI || OF_IRQ) | 20 | depends on (PCI || OF_IRQ) |
| 21 | depends on HAS_DMA | ||
| 21 | select CRC32 | 22 | select CRC32 |
| 22 | select MII | 23 | select MII |
| 23 | ---help--- | 24 | ---help--- |
| @@ -42,6 +43,7 @@ config VIA_RHINE_MMIO | |||
| 42 | config VIA_VELOCITY | 43 | config VIA_VELOCITY |
| 43 | tristate "VIA Velocity support" | 44 | tristate "VIA Velocity support" |
| 44 | depends on (PCI || (OF_ADDRESS && OF_IRQ)) | 45 | depends on (PCI || (OF_ADDRESS && OF_IRQ)) |
| 46 | depends on HAS_DMA | ||
| 45 | select CRC32 | 47 | select CRC32 |
| 46 | select CRC_CCITT | 48 | select CRC_CCITT |
| 47 | select MII | 49 | select MII |