From: Adrian Bunk Schedule obsolete OSS drivers (with ALSA drivers that support the same hardware) for removal. A rationale of the patch is in http://lkml.org/lkml/2006/12/18/305 Signed-off-by: Adrian Bunk Acked-By: Thomas Sailer Signed-off-by: Andrew Morton --- Documentation/feature-removal-schedule.txt | 7 +++++++ sound/oss/Kconfig | 16 +++++++++++++++- sound/oss/dmasound/Kconfig | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff -puN Documentation/feature-removal-schedule.txt~schedule-obsolete-oss-drivers-for-removal-3rd-round Documentation/feature-removal-schedule.txt --- a/Documentation/feature-removal-schedule.txt~schedule-obsolete-oss-drivers-for-removal-3rd-round +++ a/Documentation/feature-removal-schedule.txt @@ -257,3 +257,10 @@ Why: Speedstep-centrino driver with ACPI Who: Venkatesh Pallipadi --------------------------- + +What: drivers depending on OBSOLETE_OSS +When: options in 2.6.22, code in 2.6.24 +Why: OSS drivers with ALSA replacements +Who: Adrian Bunk + +--------------------------- diff -puN sound/oss/Kconfig~schedule-obsolete-oss-drivers-for-removal-3rd-round sound/oss/Kconfig --- a/sound/oss/Kconfig~schedule-obsolete-oss-drivers-for-removal-3rd-round +++ a/sound/oss/Kconfig @@ -5,6 +5,20 @@ # # Prompt user for primary drivers. +config OBSOLETE_OSS + bool "Obsolete OSS drivers" + depends on SOUND_PRIME + help + This option enables support for obsolete OSS drivers that + are scheduled for removal in the near future since there + are ALSA drivers for the same hardware. + + Please contact Adrian Bunk if you had to + say Y here because your soundcard is not properly supported + by ALSA. + + If unsure, say N. + config SOUND_BT878 tristate "BT878 audio dma" depends on SOUND_PRIME && PCI @@ -33,7 +47,7 @@ config SOUND_BCM_CS4297A config SOUND_ES1371 tristate "Creative Ensoniq AudioPCI 97 (ES1371)" - depends on SOUND_PRIME && PCI + depends on SOUND_PRIME && PCI && OBSOLETE_OSS help Say Y or M if you have a PCI sound card utilizing the Ensoniq ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if diff -puN sound/oss/dmasound/Kconfig~schedule-obsolete-oss-drivers-for-removal-3rd-round sound/oss/dmasound/Kconfig --- a/sound/oss/dmasound/Kconfig~schedule-obsolete-oss-drivers-for-removal-3rd-round +++ a/sound/oss/dmasound/Kconfig @@ -14,7 +14,7 @@ config DMASOUND_ATARI config DMASOUND_PMAC tristate "PowerMac DMA sound support" - depends on PPC32 && PPC_PMAC && SOUND && I2C + depends on PPC32 && PPC_PMAC && SOUND && I2C && OBSOLETE_OSS select DMASOUND help If you want to use the internal audio of your PowerMac in Linux, _