summaryrefslogtreecommitdiffstats
path: root/sound/pci/Kconfig
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2008-07-14 15:49:04 -0700
committerDavid Woodhouse <David.Woodhouse@intel.com>2008-07-14 15:51:11 -0700
commit751851af7aae9b8bd5a60b3897209081fbc18b2b (patch)
tree5cb8dbb71d691a760da61e319796800ee42cc1c5 /sound/pci/Kconfig
parenta41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff)
parentd71792ac3d48df6693f7b339e02494efc27036c3 (diff)
downloadop-kernel-dev-751851af7aae9b8bd5a60b3897209081fbc18b2b.zip
op-kernel-dev-751851af7aae9b8bd5a60b3897209081fbc18b2b.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts: sound/pci/Kconfig
Diffstat (limited to 'sound/pci/Kconfig')
-rw-r--r--sound/pci/Kconfig30
1 files changed, 0 insertions, 30 deletions
diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
index 8fe5dac..f7d95b2 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
OpenPOWER on IntegriCloud