firmware: convert maestro3 driver to use firmware loader exclusively

[linux-2.6] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 812085d521f12405867dd4c70096b49b8ef79212..32836ea4517044a9c10daef649cb181f61268f78 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -122,6 +122,21 @@ config SND_AU8830
          To compile this driver as a module, choose M here: the module
          will be called snd-au8830.
 
+config SND_AW2
+       tristate "Emagic Audiowerk 2"
+       depends on SND
+       help
+         Say Y here to include support for Emagic Audiowerk 2 soundcards.
+
+         Supported features: Analog and SPDIF output. Analog or SPDIF input.
+         Note: Switch between analog and digital input does not always work.
+         It can produce continuous noise. The workaround is to switch again
+         (and again) between digital and analog input until it works.
+
+         To compile this driver as a module, choose M here: the module
+         will be called snd-aw2.
+
+
 config SND_AZT3328
        tristate "Aztech AZF3328 / PCI168 (EXPERIMENTAL)"
        depends on SND && EXPERIMENTAL
@@ -162,6 +177,7 @@ config SND_CA0106
        depends on SND
        select SND_AC97_CODEC
        select SND_RAWMIDI
+       select SND_VMASTER
        help
          Say Y here to include support for the Sound Blaster Audigy LS
          and Live 24bit.
@@ -499,24 +515,22 @@ 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"
        depends on SND
        select SND_PCM
+       select SND_VMASTER
        help
          Say Y here to include support for Intel "High Definition
          Audio" (Azalia) motherboard devices.
@@ -680,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.
@@ -719,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.
@@ -727,19 +741,9 @@ 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
-       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
@@ -748,15 +752,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"
        depends on SND
@@ -896,12 +891,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.