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

Conflicts:

	sound/pci/Kconfig

1 files changed, 0 insertions, 30 deletions

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 8fe5dac39428..f7d95b224a98 100644
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -696,7 +696,6 @@ config SND_INTEL8X0M
 
 config SND_KORG1212
         tristate "Korg 1212 IO"
-        select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL
         select SND_PCM
         help
           Say Y here to include support for Korg 1212IO soundcards.
@@ -704,18 +703,8 @@ config SND_KORG1212
           To compile this driver as a module, choose M here: the module
           will be called snd-korg1212.
 
-config SND_KORG1212_FIRMWARE_IN_KERNEL
-        bool "In-kernel firmware for Korg1212 driver"
-        depends on SND_KORG1212
-        default y
-        help
-          Say Y here to include the static firmware built in the kernel
-          for the Korg1212 driver.  If you choose N here, you need to
-          install the firmware files from the alsa-firmware package.
-
 config SND_MAESTRO3
         tristate "ESS Allegro/Maestro3"
-        select FW_LOADER if !SND_MAESTRO3_FIRMWARE_IN_KERNEL
         select SND_AC97_CODEC
         help
           Say Y here to include support for soundcards based on ESS Maestro 3
@@ -724,15 +713,6 @@ config SND_MAESTRO3
           To compile this driver as a module, choose M here: the module
           will be called snd-maestro3.
 
-config SND_MAESTRO3_FIRMWARE_IN_KERNEL
-        bool "In-kernel firmware for Maestro3 driver"
-        depends on SND_MAESTRO3
-        default y
-        help
-          Say Y here to include the static firmware built in the kernel
-          for the Maestro3 driver.  If you choose N here, you need to
-          install the firmware files from the alsa-firmware package.
-
 config SND_MIXART
         tristate "Digigram miXart"
         select SND_HWDEP
@@ -881,7 +861,6 @@ config SND_VX222
 
 config SND_YMFPCI
         tristate "Yamaha YMF724/740/744/754"
-        select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL
         select SND_OPL3_LIB
         select SND_MPU401_UART
         select SND_AC97_CODEC
@@ -892,13 +871,4 @@ config SND_YMFPCI
           To compile this driver as a module, choose M here: the module
           will be called snd-ymfpci.
 
-config SND_YMFPCI_FIRMWARE_IN_KERNEL
-        bool "In-kernel firmware for YMFPCI driver"
-        depends on SND_YMFPCI
-        default y
-        help
-          Say Y here to include the static firmware built in the kernel
-          for the YMFPCI driver.  If you choose N here, you need to
-          install the firmware files from the alsa-firmware package.
-
 endif   # SND_PCI