From: David Woodhouse Date: Mon, 14 Jul 2008 22:49:04 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git X-Git-Tag: v2.6.27-rc1~1094^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=751851af7aae9b8bd5a60b3897209081fbc18b2b;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git Conflicts: sound/pci/Kconfig --- 751851af7aae9b8bd5a60b3897209081fbc18b2b diff --cc sound/isa/Kconfig index 25347a25d63,1ff9f631084..5769a13c1d9 --- a/sound/isa/Kconfig +++ b/sound/isa/Kconfig @@@ -370,17 -391,9 +370,8 @@@ config SND_SB16_CS coprocessor can do variable tasks like various compression and decompression algorithms. - config SND_SB16_CSP_FIRMWARE_IN_KERNEL - bool "In-kernel firmware for SB16 CSP" - depends on SND_SB16_CSP - default y - help - Say Y here to include the static firmware built in the kernel - for the SB16 CSP controller. If you choose N here, you need - to install the firmware files from the alsa-firmware package. - config SND_SGALAXY tristate "Aztech Sound Galaxy" - depends on SND select SND_AD1848_LIB help Say Y here to include support for Aztech Sound Galaxy diff --cc sound/pci/Kconfig index 8fe5dac3942,e4a0045e2a3..f7d95b224a9 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig @@@ -696,7 -733,7 +696,6 @@@ config SND_INTEL8X0 config SND_KORG1212 tristate "Korg 1212 IO" - select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL - depends on SND select SND_PCM help Say Y here to include support for Korg 1212IO soundcards. @@@ -704,18 -741,9 +703,8 @@@ 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 - depends on SND select SND_AC97_CODEC help Say Y here to include support for soundcards based on ESS Maestro 3 @@@ -724,17 -752,9 +713,8 @@@ 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 select SND_HWDEP select SND_PCM help @@@ -881,7 -913,7 +861,6 @@@ config SND_VX22 config SND_YMFPCI tristate "Yamaha YMF724/740/744/754" - select FW_LOADER if !SND_YMFPCI_FIRMWARE_IN_KERNEL - depends on SND select SND_OPL3_LIB select SND_MPU401_UART select SND_AC97_CODEC @@@ -892,13 -924,25 +871,4 @@@ 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 -config SND_AC97_POWER_SAVE - bool "AC97 Power-Saving Mode" - depends on SND_AC97_CODEC && EXPERIMENTAL - default n -- 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. - Say Y here to enable the aggressive power-saving support of - AC97 codecs. In this mode, the power-mode is dynamically - controlled at each open/close. - - The mode is activated by passing power_save=1 option to - snd-ac97-codec driver. You can toggle it dynamically over - sysfs, too. - -config SND_AC97_POWER_SAVE_DEFAULT - int "Default time-out for AC97 power-save mode" - depends on SND_AC97_POWER_SAVE - default 0 - help - The default time-out value in seconds for AC97 automatic - power-save mode. 0 means to disable the power-save mode. -- -endmenu +endif # SND_PCI