Commit cf34be7a authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

usb: host: Host drivers relying on DMA should depend on HAS_DMA

If NO_DMA=y:

    ERROR: "bad_dma_ops" [drivers/usb/host/xhci-plat-hcd.ko] undefined!
    ERROR: "bad_dma_ops" [drivers/usb/host/xhci-mtk.ko] undefined!
    ERROR: "dma_pool_destroy" [drivers/usb/host/xhci-hcd.ko] undefined!
    ERROR: "bad_dma_ops" [drivers/usb/host/xhci-hcd.ko] undefined!
    ERROR: "dma_pool_free" [drivers/usb/host/xhci-hcd.ko] undefined!
    ERROR: "dma_pool_alloc" [drivers/usb/host/xhci-hcd.ko] undefined!
    ERROR: "dma_pool_create" [drivers/usb/host/xhci-hcd.ko] undefined!
    ERROR: "bad_dma_ops" [drivers/usb/host/ohci-platform.ko] undefined!
    ERROR: "dma_pool_destroy" [drivers/usb/host/ohci-hcd.ko] undefined!
    ERROR: "bad_dma_ops" [drivers/usb/host/ohci-hcd.ko] undefined!
    ERROR: "dma_pool_free" [drivers/usb/host/ohci-hcd.ko] undefined!
    ERROR: "dma_pool_alloc" [drivers/usb/host/ohci-hcd.ko] undefined!
    ERROR: "dma_pool_create" [drivers/usb/host/ohci-hcd.ko] undefined!
    ERROR: "dma_pool_create" [drivers/usb/host/fotg210-hcd.ko] undefined!
    ERROR: "bad_dma_ops" [drivers/usb/host/fotg210-hcd.ko] undefined!
    ERROR: "dma_pool_destroy" [drivers/usb/host/fotg210-hcd.ko] undefined!
    ERROR: "dma_pool_alloc" [drivers/usb/host/fotg210-hcd.ko] undefined!
    ERROR: "dma_pool_free" [drivers/usb/host/fotg210-hcd.ko] undefined!
    ERROR: "bad_dma_ops" [drivers/usb/host/ehci-platform.ko] undefined!
    ERROR: "dma_pool_destroy" [drivers/usb/host/ehci-hcd.ko] undefined!
    ERROR: "bad_dma_ops" [drivers/usb/host/ehci-hcd.ko] undefined!
    ERROR: "dma_pool_free" [drivers/usb/host/ehci-hcd.ko] undefined!
    ERROR: "dma_pool_alloc" [drivers/usb/host/ehci-hcd.ko] undefined!
    ERROR: "dma_pool_create" [drivers/usb/host/ehci-hcd.ko] undefined!

Add dependencies on HAS_DMA to fix this.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6d6fc2b
...@@ -18,7 +18,7 @@ config USB_C67X00_HCD ...@@ -18,7 +18,7 @@ config USB_C67X00_HCD
config USB_XHCI_HCD config USB_XHCI_HCD
tristate "xHCI HCD (USB 3.0) support" tristate "xHCI HCD (USB 3.0) support"
depends on HAS_IOMEM depends on HAS_DMA && HAS_IOMEM
---help--- ---help---
The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
"SuperSpeed" host controller hardware. "SuperSpeed" host controller hardware.
...@@ -73,7 +73,7 @@ endif # USB_XHCI_HCD ...@@ -73,7 +73,7 @@ endif # USB_XHCI_HCD
config USB_EHCI_HCD config USB_EHCI_HCD
tristate "EHCI HCD (USB 2.0) support" tristate "EHCI HCD (USB 2.0) support"
depends on HAS_IOMEM depends on HAS_DMA && HAS_IOMEM
---help--- ---help---
The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
"high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware. "high speed" (480 Mbit/sec, 60 Mbyte/sec) host controller hardware.
...@@ -368,8 +368,7 @@ config USB_ISP1362_HCD ...@@ -368,8 +368,7 @@ config USB_ISP1362_HCD
config USB_FOTG210_HCD config USB_FOTG210_HCD
tristate "FOTG210 HCD support" tristate "FOTG210 HCD support"
depends on USB depends on USB && HAS_DMA && HAS_IOMEM
depends on HAS_IOMEM
---help--- ---help---
Faraday FOTG210 is an OTG controller which can be configured as Faraday FOTG210 is an OTG controller which can be configured as
an USB2.0 host. It is designed to meet USB2.0 EHCI specification an USB2.0 host. It is designed to meet USB2.0 EHCI specification
...@@ -391,7 +390,7 @@ config USB_MAX3421_HCD ...@@ -391,7 +390,7 @@ config USB_MAX3421_HCD
config USB_OHCI_HCD config USB_OHCI_HCD
tristate "OHCI HCD (USB 1.1) support" tristate "OHCI HCD (USB 1.1) support"
depends on HAS_IOMEM depends on HAS_DMA && HAS_IOMEM
---help--- ---help---
The Open Host Controller Interface (OHCI) is a standard for accessing The Open Host Controller Interface (OHCI) is a standard for accessing
USB 1.1 host controller hardware. It does more in hardware than Intel's USB 1.1 host controller hardware. It does more in hardware than Intel's
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment