Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Conflicts:

	sound/pci/Kconfig

1 files changed, 12 insertions, 12 deletions

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 9ba64ccc1359..9a7681b55266 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.