missing dependencies for USB drivers in input

stuff that does select USB should depend on USB_ARCH_HAS_HCD, or we'll
end up with unbuildable configs.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 82f563e24fdbc39e0e0945ff16f8fca980da05a8..b0023452ec90a78c7297804ded4c0c3757d900dd 100644 (file)
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -255,6 +255,7 @@ config JOYSTICK_JOYDUMP
 
 config JOYSTICK_XPAD
        tristate "X-Box gamepad support"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the X-Box pad with your computer.

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 6013ace94d98675a1ba1b47781d9470db82ca161..842a7b4d16f8c733dc19177edf3ea39176baf0d7 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -84,6 +84,7 @@ config INPUT_ATLAS_BTNS
 
 config INPUT_ATI_REMOTE
        tristate "ATI / X10 USB RF remote control"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
@@ -99,6 +100,7 @@ config INPUT_ATI_REMOTE
 
 config INPUT_ATI_REMOTE2
        tristate "ATI / Philips USB RF remote control"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an ATI or Philips USB RF remote control.
@@ -114,6 +116,7 @@ config INPUT_ATI_REMOTE2
 config INPUT_KEYSPAN_REMOTE
        tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
        depends on EXPERIMENTAL
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use a Keyspan DMR USB remote control.
@@ -128,6 +131,7 @@ config INPUT_KEYSPAN_REMOTE
 
 config INPUT_POWERMATE
        tristate "Griffin PowerMate and Contour Jog support"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
@@ -144,6 +148,7 @@ config INPUT_POWERMATE
 config INPUT_YEALINK
        tristate "Yealink usb-p1k voip phone"
        depends EXPERIMENTAL
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to enable keyboard and LCD functions of the

diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig
index 2ccc114b3ff6b612e94d2ce6ac92c70126c3cdda..eb0167e9f0cbe66a591ba65c90dffadb5103daff 100644 (file)
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -111,6 +111,7 @@ config MOUSE_SERIAL
 
 config MOUSE_APPLETOUCH
        tristate "Apple USB Touchpad support"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use an Apple USB Touchpad.

diff --git a/drivers/input/tablet/Kconfig b/drivers/input/tablet/Kconfig
index 12dfb0eb326233741848d6c2013730823fddd56f..d371c0bdc0bdbad09fd9e56e87f2526e5218f0ca 100644 (file)
--- a/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
@@ -13,6 +13,7 @@ if INPUT_TABLET
 
 config TABLET_USB_ACECAD
        tristate "Acecad Flair tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the USB version of the Acecad Flair
@@ -25,6 +26,7 @@ config TABLET_USB_ACECAD
 
 config TABLET_USB_AIPTEK
        tristate "Aiptek 6000U/8000U tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the USB version of the Aiptek 6000U
@@ -49,6 +51,7 @@ config TABLET_USB_GTCO
 
 config TABLET_USB_KBTAB
        tristate "KB Gear JamStudio tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the USB version of the KB Gear
@@ -61,6 +64,7 @@ config TABLET_USB_KBTAB
 
 config TABLET_USB_WACOM
        tristate "Wacom Intuos/Graphire tablet support (USB)"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          Say Y here if you want to use the USB version of the Wacom Intuos

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 5e640aeb03cdfa0ac1eb781c6232c6b3b117ff0c..4f091800bfebd30daa41b00fb96a93c2b9911eb2 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -166,6 +166,7 @@ config TOUCHSCREEN_UCB1400
 
 config TOUCHSCREEN_USB_COMPOSITE
        tristate "USB Touchscreen Driver"
+       depends on USB_ARCH_HAS_HCD
        select USB
        help
          USB Touchscreen driver for: