From 1d2c259143ae201ffe5bedff4cf5bd2d283420e2 Mon Sep 17 00:00:00 2001 From: Maximilian Attems Date: Mon, 21 May 2007 21:15:24 +0000 Subject: [PATCH] i386, amd64: explicitly disable CONFIG_OSS_OBSOLETE svn path=/dists/trunk/linux-2.6/; revision=8691 --- debian/arch/amd64/config | 1 + debian/arch/i386/config | 1 + debian/changelog | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 38d09f60f..fd5d4249e 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -1098,6 +1098,7 @@ CONFIG_SND_HDA_INTEL=m CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m CONFIG_SOUND_PRIME=m +# CONFIG_OSS_OBSOLETE is not set CONFIG_SOUND_BT878=m CONFIG_SOUND_ICH=m CONFIG_SOUND_TRIDENT=m diff --git a/debian/arch/i386/config b/debian/arch/i386/config index ef29d09f6..8a8985c8e 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -1349,6 +1349,7 @@ CONFIG_SND_HDA_INTEL=m CONFIG_SND_USB_AUDIO=m CONFIG_SND_USB_USX2Y=m CONFIG_SOUND_PRIME=m +# CONFIG_OSS_OBSOLETE is not set CONFIG_SOUND_BT878=m CONFIG_SOUND_ICH=m CONFIG_SOUND_TRIDENT=m diff --git a/debian/changelog b/debian/changelog index 6d05be038..372300b99 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,11 +11,12 @@ linux-2.6 (2.6.22~rc2-1~experimental.1) UNRELEASED; urgency=low GIGASET_M101, SATA_INIC162X and disable SCSI_ESP_CORE in topconfig. * [amd64, i386]: Take care of the renaming acpi-ibm to thinkpad-acpi. Enable KINGSUN_DONGLE, AF_RXRPC, RXKAD, MTD_NAND_PLATFORM, BLINK, PHANTOM. + Disable OSS_OBSOLETE. * Enable WLAN_PRE80211 and WLAN_80211 on all archs with NET_RADIO enabled. * Fix RTC_INTF_{DEV,SYSFS,PROC}=y where enabled modular. * Enable new wirless stack mac80211 and improved wireless conf api. - -- maximilian attems Mon, 21 May 2007 22:33:17 +0200 + -- maximilian attems Mon, 21 May 2007 23:16:13 +0200 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low