diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 16:54:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 16:54:07 -0700 |
| commit | 5a86102248592e178a9023359ccf7f0e489d8e35 (patch) | |
| tree | 9e5fdb9aafca687fa412f7c034f2cfbb834b8567 /drivers/usb/serial/Kconfig | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
| parent | 751851af7aae9b8bd5a60b3897209081fbc18b2b (diff) | |
Merge branch 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6
* 'for-2.6.27' of git://git.infradead.org/users/dwmw2/firmware-2.6: (64 commits)
firmware: convert sb16_csp driver to use firmware loader exclusively
dsp56k: use request_firmware
edgeport-ti: use request_firmware()
edgeport: use request_firmware()
vicam: use request_firmware()
dabusb: use request_firmware()
cpia2: use request_firmware()
ip2: use request_firmware()
firmware: convert Ambassador ATM driver to request_firmware()
whiteheat: use request_firmware()
ti_usb_3410_5052: use request_firmware()
emi62: use request_firmware()
emi26: use request_firmware()
keyspan_pda: use request_firmware()
keyspan: use request_firmware()
ttusb-budget: use request_firmware()
kaweth: use request_firmware()
smctr: use request_firmware()
firmware: convert ymfpci driver to use firmware loader exclusively
firmware: convert maestro3 driver to use firmware loader exclusively
...
Fix up trivial conflicts with BKL removal in drivers/char/dsp56k.c and
drivers/char/ip2/ip2main.c manually.
Diffstat (limited to 'drivers/usb/serial/Kconfig')
| -rw-r--r-- | drivers/usb/serial/Kconfig | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index 9ba64ccc135..9a7681b5526 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig @@ -304,19 +304,19 @@ config USB_SERIAL_KEYSPAN config USB_SERIAL_KEYSPAN_MPR bool "USB Keyspan MPR Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the Keyspan MPR converter. config USB_SERIAL_KEYSPAN_USA28 bool "USB Keyspan USA-28 Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-28 converter. config USB_SERIAL_KEYSPAN_USA28X bool "USB Keyspan USA-28X Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-28X converter. Be sure you have a USA-28X, there are also 28XA and 28XB @@ -324,7 +324,7 @@ config USB_SERIAL_KEYSPAN_USA28X config USB_SERIAL_KEYSPAN_USA28XA bool "USB Keyspan USA-28XA Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-28XA converter. Be sure you have a USA-28XA, there are also 28X and 28XB @@ -332,7 +332,7 @@ config USB_SERIAL_KEYSPAN_USA28XA config USB_SERIAL_KEYSPAN_USA28XB bool "USB Keyspan USA-28XB Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-28XB converter. Be sure you have a USA-28XB, there are also 28X and 28XA @@ -340,43 +340,43 @@ config USB_SERIAL_KEYSPAN_USA28XB config USB_SERIAL_KEYSPAN_USA19 bool "USB Keyspan USA-19 Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-19 converter. config USB_SERIAL_KEYSPAN_USA18X bool "USB Keyspan USA-18X Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-18X converter. config USB_SERIAL_KEYSPAN_USA19W bool "USB Keyspan USA-19W Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-19W converter. config USB_SERIAL_KEYSPAN_USA19QW bool "USB Keyspan USA-19QW Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-19QW converter. config USB_SERIAL_KEYSPAN_USA19QI bool "USB Keyspan USA-19QI Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-19QI converter. config USB_SERIAL_KEYSPAN_USA49W bool "USB Keyspan USA-49W Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-49W converter. config USB_SERIAL_KEYSPAN_USA49WLC bool "USB Keyspan USA-49WLC Firmware" - depends on USB_SERIAL_KEYSPAN + depends on USB_SERIAL_KEYSPAN && FIRMWARE_IN_KERNEL help Say Y here to include firmware for the USA-49WLC converter. |