firmware: convert korg1212 driver to use firmware loader exclusively

[safe/jmp/linux-2.6] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 868183b..1abbf87 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -515,19 +515,16 @@ config SND_FM801
 config SND_FM801_TEA575X_BOOL
        bool "ForteMedia FM801 + TEA5757 tuner"
        depends on SND_FM801
+       depends on VIDEO_V4L1=y || VIDEO_V4L1=SND_FM801
        help
          Say Y here to include support for soundcards based on the ForteMedia
          FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
          Forte SF256-PCS-02) into the snd-fm801 driver.
 
-         This will enable support for the old V4L1 API.
-
 config SND_FM801_TEA575X
        tristate
        depends on SND_FM801_TEA575X_BOOL
        default SND_FM801
-       select VIDEO_V4L1
-       select VIDEO_DEV
 
 config SND_HDA_INTEL
        tristate "Intel HD Audio"
@@ -697,6 +694,7 @@ config SND_ICE1724
        depends on SND
        select SND_MPU401_UART
        select SND_AC97_CODEC
+       select SND_VMASTER
        help
          Say Y here to include support for soundcards based on
          ICE/VT1724/1720 (Envy24HT/PT) chips.
@@ -736,7 +734,6 @@ config SND_INTEL8X0M
 config SND_KORG1212
        tristate "Korg 1212 IO"
        depends on SND
-       select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL
        select SND_PCM
        help
          Say Y here to include support for Korg 1212IO soundcards.
@@ -744,15 +741,6 @@ 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"
        depends on SND
@@ -913,12 +901,12 @@ config SND_VIA82XX_MODEM
          will be called snd-via82xx-modem.
 
 config SND_VIRTUOSO
-       tristate "Asus Virtuoso 200 (Xonar)"
+       tristate "Asus Virtuoso 100/200 (Xonar)"
        depends on SND
        select SND_OXYGEN_LIB
        help
          Say Y here to include support for sound cards based on the
-         Asus AV200 chip, i.e., Xonar D2 and Xonar D2X.
+         Asus AV100/AV200 chips, i.e., Xonar D2, DX and D2X.
 
          To compile this driver as a module, choose M here: the module
          will be called snd-virtuoso.