Merge branch 'bsg' of git://git.kernel.dk/data/git/linux-2.6-block

[powerpc.git] / sound / pci / Kconfig

diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 12dfda3..61e35ec 100644 (file)
--- a/sound/pci/Kconfig
+++ b/sound/pci/Kconfig
@@ -576,6 +576,7 @@ 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.
@@ -586,17 +587,16 @@ config SND_KORG1212
 config SND_KORG1212_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for Korg1212 driver"
        depends on SND_KORG1212
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel
-         for Korg1212 driver.  If you choose N here, the external
-         firmware files from alsa-plugins pacakge are necessary.
+         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
+       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
@@ -608,12 +608,11 @@ config SND_MAESTRO3
 config SND_MAESTRO3_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for Maestro3 driver"
        depends on SND_MAESTRO3
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel
-         for Maestro3 driver.  If you choose N here, the external
-         firmware files from alsa-plugins pacakge are necessary.
+         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"
@@ -756,6 +755,7 @@ config SND_VX222
 config SND_YMFPCI
        tristate "Yamaha YMF724/740/744/754"
        depends on SND
+       select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL
        select SND_OPL3_LIB
        select SND_MPU401_UART
        select SND_AC97_CODEC
@@ -769,12 +769,11 @@ config SND_YMFPCI
 config SND_YMFPCI_FIRMWARE_IN_KERNEL
        bool "In-kernel firmware for YMFPCI driver"
        depends on SND_YMFPCI
-       select FW_LOADER
        default y
        help
          Say Y here to include the static firmware built in the kernel
-         for YMFPCI driver.  If you choose N here, the external
-         firmware files from alsa-plugins pacakge are necessary.
+         for the YMFPCI driver.  If you choose N here, you need to
+         install the firmware files from the alsa-firmware package.
 
 config SND_AC97_POWER_SAVE
        bool "AC97 Power-Saving Mode"