aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-05-15 15:36:20 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-15 21:56:37 -0400
commit7a86edef395576f69d2513c62aea7c966043bc8d (patch)
treee0c2a8fb6275457b9b3c89c3701abba75a28e93d
parentfaa2fb4e67775101a5c46074fa24f0d81cdb4deb (diff)
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>
-rw-r--r--drivers/input/joystick/Kconfig1
-rw-r--r--drivers/input/misc/Kconfig5
-rw-r--r--drivers/input/mouse/Kconfig1
-rw-r--r--drivers/input/tablet/Kconfig4
-rw-r--r--drivers/input/touchscreen/Kconfig1
5 files changed, 12 insertions, 0 deletions
diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index 82f563e24fdb..b0023452ec90 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -255,6 +255,7 @@ config JOYSTICK_JOYDUMP
255 255
256config JOYSTICK_XPAD 256config JOYSTICK_XPAD
257 tristate "X-Box gamepad support" 257 tristate "X-Box gamepad support"
258 depends on USB_ARCH_HAS_HCD
258 select USB 259 select USB
259 help 260 help
260 Say Y here if you want to use the X-Box pad with your computer. 261 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 6013ace94d98..842a7b4d16f8 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -84,6 +84,7 @@ config INPUT_ATLAS_BTNS
84 84
85config INPUT_ATI_REMOTE 85config INPUT_ATI_REMOTE
86 tristate "ATI / X10 USB RF remote control" 86 tristate "ATI / X10 USB RF remote control"
87 depends on USB_ARCH_HAS_HCD
87 select USB 88 select USB
88 help 89 help
89 Say Y here if you want to use an ATI or X10 "Lola" USB remote control. 90 Say Y here if you want to use an ATI or X10 "Lola" USB remote control.
@@ -99,6 +100,7 @@ config INPUT_ATI_REMOTE
99 100
100config INPUT_ATI_REMOTE2 101config INPUT_ATI_REMOTE2
101 tristate "ATI / Philips USB RF remote control" 102 tristate "ATI / Philips USB RF remote control"
103 depends on USB_ARCH_HAS_HCD
102 select USB 104 select USB
103 help 105 help
104 Say Y here if you want to use an ATI or Philips USB RF remote control. 106 Say Y here if you want to use an ATI or Philips USB RF remote control.
@@ -114,6 +116,7 @@ config INPUT_ATI_REMOTE2
114config INPUT_KEYSPAN_REMOTE 116config INPUT_KEYSPAN_REMOTE
115 tristate "Keyspan DMR USB remote control (EXPERIMENTAL)" 117 tristate "Keyspan DMR USB remote control (EXPERIMENTAL)"
116 depends on EXPERIMENTAL 118 depends on EXPERIMENTAL
119 depends on USB_ARCH_HAS_HCD
117 select USB 120 select USB
118 help 121 help
119 Say Y here if you want to use a Keyspan DMR USB remote control. 122 Say Y here if you want to use a Keyspan DMR USB remote control.
@@ -128,6 +131,7 @@ config INPUT_KEYSPAN_REMOTE
128 131
129config INPUT_POWERMATE 132config INPUT_POWERMATE
130 tristate "Griffin PowerMate and Contour Jog support" 133 tristate "Griffin PowerMate and Contour Jog support"
134 depends on USB_ARCH_HAS_HCD
131 select USB 135 select USB
132 help 136 help
133 Say Y here if you want to use Griffin PowerMate or Contour Jog devices. 137 Say Y here if you want to use Griffin PowerMate or Contour Jog devices.
@@ -144,6 +148,7 @@ config INPUT_POWERMATE
144config INPUT_YEALINK 148config INPUT_YEALINK
145 tristate "Yealink usb-p1k voip phone" 149 tristate "Yealink usb-p1k voip phone"
146 depends EXPERIMENTAL 150 depends EXPERIMENTAL
151 depends on USB_ARCH_HAS_HCD
147 select USB 152 select USB
148 help 153 help
149 Say Y here if you want to enable keyboard and LCD functions of the 154 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 2ccc114b3ff6..eb0167e9f0cb 100644
--- a/drivers/input/mouse/Kconfig
+++ b/drivers/input/mouse/Kconfig
@@ -111,6 +111,7 @@ config MOUSE_SERIAL
111 111
112config MOUSE_APPLETOUCH 112config MOUSE_APPLETOUCH
113 tristate "Apple USB Touchpad support" 113 tristate "Apple USB Touchpad support"
114 depends on USB_ARCH_HAS_HCD
114 select USB 115 select USB
115 help 116 help
116 Say Y here if you want to use an Apple USB Touchpad. 117 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 12dfb0eb3262..d371c0bdc0bd 100644
--- a/drivers/input/tablet/Kconfig
+++ b/drivers/input/tablet/Kconfig
@@ -13,6 +13,7 @@ if INPUT_TABLET
13 13
14config TABLET_USB_ACECAD 14config TABLET_USB_ACECAD
15 tristate "Acecad Flair tablet support (USB)" 15 tristate "Acecad Flair tablet support (USB)"
16 depends on USB_ARCH_HAS_HCD
16 select USB 17 select USB
17 help 18 help
18 Say Y here if you want to use the USB version of the Acecad Flair 19 Say Y here if you want to use the USB version of the Acecad Flair
@@ -25,6 +26,7 @@ config TABLET_USB_ACECAD
25 26
26config TABLET_USB_AIPTEK 27config TABLET_USB_AIPTEK
27 tristate "Aiptek 6000U/8000U tablet support (USB)" 28 tristate "Aiptek 6000U/8000U tablet support (USB)"
29 depends on USB_ARCH_HAS_HCD
28 select USB 30 select USB
29 help 31 help
30 Say Y here if you want to use the USB version of the Aiptek 6000U 32 Say Y here if you want to use the USB version of the Aiptek 6000U
@@ -49,6 +51,7 @@ config TABLET_USB_GTCO
49 51
50config TABLET_USB_KBTAB 52config TABLET_USB_KBTAB
51 tristate "KB Gear JamStudio tablet support (USB)" 53 tristate "KB Gear JamStudio tablet support (USB)"
54 depends on USB_ARCH_HAS_HCD
52 select USB 55 select USB
53 help 56 help
54 Say Y here if you want to use the USB version of the KB Gear 57 Say Y here if you want to use the USB version of the KB Gear
@@ -61,6 +64,7 @@ config TABLET_USB_KBTAB
61 64
62config TABLET_USB_WACOM 65config TABLET_USB_WACOM
63 tristate "Wacom Intuos/Graphire tablet support (USB)" 66 tristate "Wacom Intuos/Graphire tablet support (USB)"
67 depends on USB_ARCH_HAS_HCD
64 select USB 68 select USB
65 help 69 help
66 Say Y here if you want to use the USB version of the Wacom Intuos 70 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 5e640aeb03cd..4f091800bfeb 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -166,6 +166,7 @@ config TOUCHSCREEN_UCB1400
166 166
167config TOUCHSCREEN_USB_COMPOSITE 167config TOUCHSCREEN_USB_COMPOSITE
168 tristate "USB Touchscreen Driver" 168 tristate "USB Touchscreen Driver"
169 depends on USB_ARCH_HAS_HCD
169 select USB 170 select USB
170 help 171 help
171 USB Touchscreen driver for: 172 USB Touchscreen driver for: