Home Explore Help
Sign In
PUBLIC_REPOS
/
ti-processor-sdk-linux
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
Geert Uytterhoeven 10 years ago
parent
ebc032391c
commit
0f8b6cea1f
1 changed files with 2 additions and 0 deletions
Unified View Show Diff Stats
  1. 2 0
      drivers/net/ethernet/via/Kconfig

+ 2 - 0
drivers/net/ethernet/via/Kconfig
View File 

@@ -18,6 +18,7 @@ if NET_VENDOR_VIA
 
 config VIA_RHINE
 
 config VIA_RHINE
 
 	tristate "VIA Rhine support"
 
 	tristate "VIA Rhine support"
 
 	depends on (PCI || OF_IRQ)
 
 	depends on (PCI || OF_IRQ)
 
+	depends on HAS_DMA
 
 	select CRC32
 
 	select CRC32
 
 	select MII
 
 	select MII
 
 	---help---
 
 	---help---
 
@@ -42,6 +43,7 @@ config VIA_RHINE_MMIO
 
 config VIA_VELOCITY
 
 config VIA_VELOCITY
 
 	tristate "VIA Velocity support"
 
 	tristate "VIA Velocity support"
 
 	depends on (PCI || (OF_ADDRESS && OF_IRQ))
 
 	depends on (PCI || (OF_ADDRESS && OF_IRQ))
 
+	depends on HAS_DMA
 
 	select CRC32
 
 	select CRC32
 
 	select CRC_CCITT
 
 	select CRC_CCITT
 
 	select MII
 
 	select MII