diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 15:05:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 15:05:22 -0700 |
| commit | 699ddda6ecd5751fd05fd5128aa7f93438974468 (patch) | |
| tree | b09b6a347c2e437e9c8bd5cd87f94fe03944a437 /drivers/usb/misc/Kconfig | |
| parent | acbb67d51ef0ff942d592d44fb8abb4c931041ff (diff) | |
| parent | ab352c2687a4361aec06a184ddb20deb1e5091eb (diff) | |
| download | kernel-crypto-699ddda6ecd5751fd05fd5128aa7f93438974468.tar.gz kernel-crypto-699ddda6ecd5751fd05fd5128aa7f93438974468.tar.xz kernel-crypto-699ddda6ecd5751fd05fd5128aa7f93438974468.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (47 commits)
USB: Add device id for Sierra Wireless MC8755
USB: cleanup sierra wireless driver a bit
USB: Sierra Wireless driver update
USB: ftdi_sio whitespace fixes
USB-SERIAL:cp2101 Add new device ID
USB/gadget/net2280: handle sysfs errors
usbtouchscreen: fix data reading for ITM touchscreens
UEAGLE: fix ueagle-atm Oops
USB: xpad: dance pad support
USB: input: extract() and implement() are bit field manipulation routines
USB: Memory leak in drivers/usb/serial/airprime.c
USB Storage: unusual_devs.h entry for Sony Ericsson P990i
USB: fix usbatm tiny race
USB: unusual_devs entry for Nokia 6234
USB: mos7840.c: fix a check-after-dereference
USB: ftdi-elan.c: remove dead code
USB: Mitsumi USB FDD 061M: UNUSUAL_DEV multilun fix
USB: fix dereference in drivers/usb/misc/adutux.c
USB: add USB serial mos7720 driver
USB: move trancevibrator.c to the proper usb directory
...
Diffstat (limited to 'drivers/usb/misc/Kconfig')
| -rw-r--r-- | drivers/usb/misc/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index c29658f69e2..a74bf8617e7 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig @@ -223,6 +223,16 @@ config USB_LD To compile this driver as a module, choose M here: the module will be called ldusb. +config USB_TRANCEVIBRATOR + tristate "PlayStation 2 Trance Vibrator driver support" + depends on USB + help + Say Y here if you want to connect a PlayStation 2 Trance Vibrator + device to your computer's USB port. + + To compile this driver as a module, choose M here: the + module will be called trancevibrator. + config USB_TEST tristate "USB testing driver (DEVELOPMENT)" depends on USB && USB_DEVICEFS && EXPERIMENTAL |