diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-11 17:29:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-11 17:29:32 -0700 |
commit | 631025b4d87d5a9d7e04a1ed652d247191e223d4 (patch) | |
tree | 9d96ac072b1856cb62913113260a90ecd9031823 /drivers/usb/misc/Kconfig | |
parent | aaef4d6c2ee64d5e4d59b7c4d23c37ce59115211 (diff) | |
parent | 5340ba827b6269ccd2dcfd3d966626d9dd75d5d4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: don't use reset-resume if drivers don't support it
USB: isp1760: Assign resource fields before adding hcd
isight_firmware: Avoid crash on loading invalid firmware
USB: fix build bug in USB_ISIGHTFW
Diffstat (limited to 'drivers/usb/misc/Kconfig')
-rw-r--r-- | drivers/usb/misc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig index eb6c06979f3..001789c9a11 100644 --- a/drivers/usb/misc/Kconfig +++ b/drivers/usb/misc/Kconfig @@ -272,6 +272,7 @@ config USB_TEST config USB_ISIGHTFW tristate "iSight firmware loading support" depends on USB + select FW_LOADER help This driver loads firmware for USB Apple iSight cameras, allowing them to be driven by the USB video class driver available at |