aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-02-06 11:24:01 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-08 15:16:12 -0500
commit5273afe359f700ac28bf8e9d63d733dbe0483e62 (patch)
treed1b59c42f558e9a22e6b95461bc5861e530971be /drivers/usb
parentcd060956c5e97931c3909e4a808508469c0bb9f6 (diff)
drivers/usb: add missing GENERIC_HARDIRQS dependencies
Add a couple of missing GENERIC_HARDIRQS dependencies to fix link errors like below on s390: ERROR: "devm_request_threaded_irq" [drivers/usb/gadget/mv_udc.ko] undefined! Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/dwc3/Kconfig2
-rw-r--r--drivers/usb/gadget/Kconfig3
-rw-r--r--drivers/usb/host/Kconfig2
-rw-r--r--drivers/usb/musb/Kconfig1
-rw-r--r--drivers/usb/renesas_usbhs/Kconfig2
5 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
index 77e3f40f5cea..68e9a2c5a01a 100644
--- a/drivers/usb/dwc3/Kconfig
+++ b/drivers/usb/dwc3/Kconfig
@@ -1,6 +1,6 @@
1config USB_DWC3 1config USB_DWC3
2 tristate "DesignWare USB3 DRD Core Support" 2 tristate "DesignWare USB3 DRD Core Support"
3 depends on (USB || USB_GADGET) 3 depends on (USB || USB_GADGET) && GENERIC_HARDIRQS
4 select USB_OTG_UTILS 4 select USB_OTG_UTILS
5 select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD 5 select USB_XHCI_PLATFORM if USB_SUPPORT && USB_XHCI_HCD
6 help 6 help
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index b19c9078ee51..c5c6fa60910d 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -320,6 +320,7 @@ config USB_S3C_HSUDC
320 320
321config USB_MV_UDC 321config USB_MV_UDC
322 tristate "Marvell USB2.0 Device Controller" 322 tristate "Marvell USB2.0 Device Controller"
323 depends on GENERIC_HARDIRQS
323 help 324 help
324 Marvell Socs (including PXA and MMP series) include a high speed 325 Marvell Socs (including PXA and MMP series) include a high speed
325 USB2.0 OTG controller, which can be configured as high speed or 326 USB2.0 OTG controller, which can be configured as high speed or
@@ -441,7 +442,7 @@ config USB_GOKU
441 442
442config USB_EG20T 443config USB_EG20T
443 tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC" 444 tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
444 depends on PCI 445 depends on PCI && GENERIC_HARDIRQS
445 help 446 help
446 This is a USB device driver for EG20T PCH. 447 This is a USB device driver for EG20T PCH.
447 EG20T PCH is the platform controller hub that is used in Intel's 448 EG20T PCH is the platform controller hub that is used in Intel's
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 3a21c5d683c0..c59a1126926f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -246,7 +246,7 @@ config USB_EHCI_ATH79
246 246
247config USB_OXU210HP_HCD 247config USB_OXU210HP_HCD
248 tristate "OXU210HP HCD support" 248 tristate "OXU210HP HCD support"
249 depends on USB 249 depends on USB && GENERIC_HARDIRQS
250 ---help--- 250 ---help---
251 The OXU210HP is an USB host/OTG/device controller. Enable this 251 The OXU210HP is an USB host/OTG/device controller. Enable this
252 option if your board has this chip. If unsure, say N. 252 option if your board has this chip. If unsure, say N.
diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index de6e5ce26316..45b19e2c60ba 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -46,6 +46,7 @@ config USB_MUSB_DA8XX
46 46
47config USB_MUSB_TUSB6010 47config USB_MUSB_TUSB6010
48 tristate "TUSB6010" 48 tristate "TUSB6010"
49 depends on GENERIC_HARDIRQS
49 50
50config USB_MUSB_OMAP2PLUS 51config USB_MUSB_OMAP2PLUS
51 tristate "OMAP2430 and onwards" 52 tristate "OMAP2430 and onwards"
diff --git a/drivers/usb/renesas_usbhs/Kconfig b/drivers/usb/renesas_usbhs/Kconfig
index 6f4afa436381..29feb00d7f39 100644
--- a/drivers/usb/renesas_usbhs/Kconfig
+++ b/drivers/usb/renesas_usbhs/Kconfig
@@ -4,7 +4,7 @@
4 4
5config USB_RENESAS_USBHS 5config USB_RENESAS_USBHS
6 tristate 'Renesas USBHS controller' 6 tristate 'Renesas USBHS controller'
7 depends on USB && USB_GADGET 7 depends on USB && USB_GADGET && GENERIC_HARDIRQS
8 default n 8 default n
9 help 9 help
10 Renesas USBHS is a discrete USB host and peripheral controller chip 10 Renesas USBHS is a discrete USB host and peripheral controller chip