Author: waldi Date: Sat Sep 15 19:18:32 2007 New Revision: 9526 Log: * debian/patches/debian/dfsg/files-1: Drop files from sound/pci. * debian/patches/debian/dfsg/sound-pci.patch: Add. * debian/patches/series/orig-0: Update.
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/sound-pci.patch Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 dists/trunk/linux-2.6/debian/patches/series/orig-0 Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 (original) +++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Sat Sep 15 19:18:32 2007 @@ -50,3 +50,10 @@ rm drivers/usb/serial/keyspan_usa28x_fw.h rm drivers/usb/serial/keyspan_usa49w_fw.h rm drivers/usb/serial/keyspan_usa49wlc_fw.h + +unifdef sound/pci/korg1212/korg1212.c -UCONFIG_SND_KORG1212_FIRMWARE_IN_KERNEL +rm sound/pci/korg1212/korg1212-firmware.h +unifdef sound/pci/maestro3.c -UCONFIG_SND_MAESTRO3_FIRMWARE_IN_KERNEL +rm sound/pci/ymfpci/ymfpci_image.h +unifdef sound/pci/ymfpci/ymfpci_main.c -UCONFIG_SND_YMFPCI_FIRMWARE_IN_KERNEL + Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/sound-pci.patch ============================================================================== --- (empty file) +++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/sound-pci.patch Sat Sep 15 19:18:32 2007 @@ -0,0 +1,75 @@ +diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig +index c6b4410..b11d55d 100644 +--- a/sound/pci/Kconfig ++++ b/sound/pci/Kconfig +@@ -587,7 +587,7 @@ config SND_INTEL8X0M + config SND_KORG1212 + tristate "Korg 1212 IO" + depends on SND +- select FW_LOADER if !SND_KORG1212_FIRMWARE_IN_KERNEL ++ select FW_LOADER + select SND_PCM + help + Say Y here to include support for Korg 1212IO soundcards. +@@ -595,19 +595,10 @@ 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 FW_LOADER + select SND_AC97_CODEC + help + Say Y here to include support for soundcards based on ESS Maestro 3 +@@ -616,15 +607,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 +@@ -766,7 +748,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 FW_LOADER + select SND_OPL3_LIB + select SND_MPU401_UART + select SND_AC97_CODEC +@@ -777,15 +759,6 @@ 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. +- + config SND_AC97_POWER_SAVE + bool "AC97 Power-Saving Mode" + depends on SND_AC97_CODEC && EXPERIMENTAL Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0 ============================================================================== --- dists/trunk/linux-2.6/debian/patches/series/orig-0 (original) +++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Sat Sep 15 19:18:32 2007 @@ -6,4 +6,5 @@ + debian/dfsg/drivers-net-tokenring-3c359-smctr.patch + debian/dfsg/drivers-usb-misc-emi62-emi26.patch + debian/dfsg/drivers-usb-serial-keyspan-remove.patch ++ debian/dfsg/sound-pci.patch X debian/dfsg/files-1 _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
