diff --git a/debian/changelog b/debian/changelog index c381c236a..9ffb90522 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,7 @@ linux-2.6 (2.6.23~rc5-1~experimental.1) UNRELEASED; urgency=low - YAM driver for AX.25 - MyriCOM Gigabit Ethernet support - PTI Qlogic, ISP Driver + - Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x * Disable now broken drivers: - Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support - Broadcom Tigon3 support @@ -61,6 +62,7 @@ linux-2.6 (2.6.23~rc5-1~experimental.1) UNRELEASED; urgency=low - YAM driver for AX.25 - MyriCOM Gigabit Ethernet support - PTI Qlogic, ISP Driver + - Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x * Add -common to common header package names. * Drop provides from common header packages. diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index 822fa3643..b5b56ecc9 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -62,6 +62,8 @@ rm drivers/usb/serial/keyspan_usa28x_fw.h rm drivers/usb/serial/keyspan_usa49w_fw.h rm drivers/usb/serial/keyspan_usa49wlc_fw.h +rm sound/pci/cs46xx/cs46xx_image.h +rm sound/pci/cs46xx/imgs 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 diff --git a/debian/patches/debian/dfsg/sound-pci.patch b/debian/patches/debian/dfsg/sound-pci.patch index 951a15740..ed3512e68 100644 --- a/debian/patches/debian/dfsg/sound-pci.patch +++ b/debian/patches/debian/dfsg/sound-pci.patch @@ -1,7 +1,9 @@ -diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig -index c6b4410..b11d55d 100644 --- a/sound/pci/Kconfig +++ b/sound/pci/Kconfig +@@ -199,2 +199,3 @@ config SND_CS46XX + tristate "Cirrus Logic (Sound Fusion) CS4280/CS461x/CS462x/CS463x" ++ depends on BROKEN + depends on SND @@ -587,7 +587,7 @@ config SND_INTEL8X0M config SND_KORG1212 tristate "Korg 1212 IO"