* debian/changelog: Update.

* debian/patches/debian/dfsg/files-1: Drop more files.
* debian/patches/debian/dfsg/sound-pci.patch: Update.

svn path=/dists/trunk/linux-2.6/; revision=9565
This commit is contained in:
Bastian Blank 2007-09-26 20:00:35 +00:00
parent e2a5d6f7bc
commit 3952fbcbd5
3 changed files with 8 additions and 2 deletions

2
debian/changelog vendored
View File

@ -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.

View File

@ -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

View File

@ -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"