diff options
author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
---|---|---|
committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-03-27 11:14:38 -0400 |
commit | b92efa9abffc4a634cd2e7a0f81f8aa6310d67c9 (patch) | |
tree | 9847508d9b8d4e585f90db4a453bfbc3700c997e /drivers/usb/misc/Kconfig | |
parent | a16fffdd8eb95ebab7dc22414896fe6493951e0e (diff) | |
parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into avr32-arch
Diffstat (limited to 'drivers/usb/misc/Kconfig')
-rw-r--r-- | drivers/usb/misc/Kconfig | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index e463db5d8188..a68d91a11bee 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig | |||
@@ -135,45 +135,6 @@ config USB_CYTHERM | |||
135 | To compile this driver as a module, choose M here: the | 135 | To compile this driver as a module, choose M here: the |
136 | module will be called cytherm. | 136 | module will be called cytherm. |
137 | 137 | ||
138 | config USB_PHIDGET | ||
139 | tristate "USB Phidgets drivers" | ||
140 | depends on USB | ||
141 | help | ||
142 | Say Y here to enable the various drivers for devices from | ||
143 | Phidgets inc. | ||
144 | |||
145 | config USB_PHIDGETKIT | ||
146 | tristate "USB PhidgetInterfaceKit support" | ||
147 | depends on USB_PHIDGET | ||
148 | help | ||
149 | Say Y here if you want to connect a PhidgetInterfaceKit USB device | ||
150 | from Phidgets Inc. | ||
151 | |||
152 | To compile this driver as a module, choose M here: the | ||
153 | module will be called phidgetkit. | ||
154 | |||
155 | config USB_PHIDGETMOTORCONTROL | ||
156 | tristate "USB PhidgetMotorControl support" | ||
157 | depends on USB_PHIDGET | ||
158 | help | ||
159 | Say Y here if you want to connect a PhidgetMotorControl USB device | ||
160 | from Phidgets Inc. | ||
161 | |||
162 | To compile this driver as a module, choose M here: the | ||
163 | module will be called phidgetmotorcontrol. | ||
164 | |||
165 | config USB_PHIDGETSERVO | ||
166 | tristate "USB PhidgetServo support" | ||
167 | depends on USB_PHIDGET | ||
168 | help | ||
169 | Say Y here if you want to connect an 1 or 4 Motor PhidgetServo | ||
170 | servo controller version 2.0 or 3.0. | ||
171 | |||
172 | Phidgets Inc. has a web page at <http://www.phidgets.com/>. | ||
173 | |||
174 | To compile this driver as a module, choose M here: the | ||
175 | module will be called phidgetservo. | ||
176 | |||
177 | config USB_IDMOUSE | 138 | config USB_IDMOUSE |
178 | tristate "Siemens ID USB Mouse Fingerprint sensor support" | 139 | tristate "Siemens ID USB Mouse Fingerprint sensor support" |
179 | depends on USB | 140 | depends on USB |