From: Adrian Bunk Update the schedule for the removal of drivers depending on OBSOLETE_OSS_DRIVER as follows: - adjust OBSOLETE_OSS_DRIVER dependencie - from the release of 2.6.16 till the release of 2.6.17: approx. two months for users to report problems with the ALSA drivers for the same hardware - after the release of 2.6.17 (and before 2.6.18): remove the subset of drivers marked at OBSOLETE_OSS_DRIVER without known regressions in the ALSA drivers for the same hardware Additionally, correct some OBSOLETE_OSS_DRIVER dependencies. A rationale of the changes is in http://lkml.org/lkml/2006/1/28/135 Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- Documentation/feature-removal-schedule.txt | 2 +- sound/oss/Kconfig | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff -puN Documentation/feature-removal-schedule.txt~update-obsolete_oss_driver-schedule-and-dependencies Documentation/feature-removal-schedule.txt --- devel/Documentation/feature-removal-schedule.txt~update-obsolete_oss_driver-schedule-and-dependencies 2006-02-15 20:29:55.000000000 -0800 +++ devel-akpm/Documentation/feature-removal-schedule.txt 2006-02-15 20:29:55.000000000 -0800 @@ -26,7 +26,7 @@ Who: Adrian Bunk --------------------------- What: drivers depending on OBSOLETE_OSS_DRIVER -When: January 2006 +When: before 2.6.18 Why: OSS drivers with ALSA replacements Who: Adrian Bunk diff -puN sound/oss/Kconfig~update-obsolete_oss_driver-schedule-and-dependencies sound/oss/Kconfig --- devel/sound/oss/Kconfig~update-obsolete_oss_driver-schedule-and-dependencies 2006-02-15 20:29:55.000000000 -0800 +++ devel-akpm/sound/oss/Kconfig 2006-02-15 20:29:55.000000000 -0800 @@ -21,7 +21,7 @@ config OBSOLETE_OSS_DRIVER config SOUND_BT878 tristate "BT878 audio dma" - depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER + depends on SOUND_PRIME && PCI ---help--- Audio DMA support for bt878 based grabber boards. As you might have already noticed, bt878 is listed with two functions in /proc/pci. @@ -76,7 +76,7 @@ config SOUND_CMPCI_JOYSTICK config SOUND_EMU10K1 tristate "Creative SBLive! (EMU10K1)" - depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER + depends on SOUND_PRIME && PCI ---help--- Say Y or M if you have a PCI sound card using the EMU10K1 chipset, such as the Creative SBLive!, SB PCI512 or Emu-APS. @@ -102,7 +102,7 @@ config MIDI_EMU10K1 config SOUND_FUSION tristate "Crystal SoundFusion (CS4280/461x)" - depends on SOUND_PRIME && PCI + depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER help This module drives the Crystal SoundFusion devices (CS4280/46xx series) when wired as native sound drivers with AC97 codecs. If @@ -140,7 +140,7 @@ config SOUND_ES1370 config SOUND_ES1371 tristate "Creative Ensoniq AudioPCI 97 (ES1371)" - depends on SOUND_PRIME && PCI && OBSOLETE_OSS_DRIVER + depends on SOUND_PRIME && PCI 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 @@ -571,7 +571,7 @@ config SOUND_AD1816 config SOUND_AD1889 tristate "AD1889 based cards (AD1819 codec) (EXPERIMENTAL)" - depends on EXPERIMENTAL && SOUND_OSS && PCI + depends on EXPERIMENTAL && SOUND_OSS && PCI && OBSOLETE_OSS_DRIVER help Say M here if you have a sound card based on the Analog Devices AD1889 chip. @@ -742,7 +742,7 @@ config SOUND_MPU401 config SOUND_NM256 tristate "NM256AV/NM256ZX audio support" - depends on SOUND_OSS && OBSOLETE_OSS_DRIVER + depends on SOUND_OSS help Say M here to include audio support for the NeoMagic 256AV/256ZX chipsets. These are the audio chipsets found in the Sony @@ -919,7 +919,7 @@ config MAUI_BOOT_FILE config SOUND_YM3812 tristate "Yamaha FM synthesizer (YM3812/OPL-3) support" - depends on SOUND_OSS && OBSOLETE_OSS_DRIVER + depends on SOUND_OSS ---help--- Answer Y if your card has a FM chip made by Yamaha (OPL2/OPL3/OPL4). Answering Y is usually a safe and recommended choice, however some @@ -947,7 +947,7 @@ config SOUND_OPL3SA1 config SOUND_OPL3SA2 tristate "Yamaha OPL3-SA2 and SA3 based PnP cards" - depends on SOUND_OSS + depends on SOUND_OSS && OBSOLETE_OSS_DRIVER help Say Y or M if you have a card based on one of these Yamaha sound chipsets or the "SAx", which is actually a SA3. Read _