[2.6 patch] schedule obsolete OSS drivers for removal, 3rd round

Adrian Bunk
2007-01-04T18:53:53Z

This patch schedules 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 <bunk@stusta.de>
Acked-By: Thomas Sailer <sailer@ife.ee.ethz.ch>

---

Documentation/feature-removal-schedule.txt | 7 +++++++
sound/oss/Kconfig | 16 +++++++++++++++-
sound/oss/dmasound/Kconfig | 2 +-
3 files changed, 23 insertions(+), 2 deletions(-)

--- linux-2.6.20-rc2-mm1/Documentation/feature-removal-schedule.txt.old 2007-01-04 19:02:33.000000000 +0100
+++ linux-2.6.20-rc2-mm1/Documentation/feature-removal-schedule.txt 2007-01-04 19:04:46.000000000 +0100
@@ -221,3 +221,10 @@
Who: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>

---------------------------
+
+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 <bunk@stusta.de>
+
+---------------------------
--- linux-2.6.20-rc2-mm1/sound/oss/Kconfig.old 2007-01-04 19:04:58.000000000 +0100
+++ linux-2.6.20-rc2-mm1/sound/oss/Kconfig 2007-01-04 19:07:30.000000000 +0100
@@ -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 <bunk@stusta.de> 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_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
--- linux-2.6.20-rc2-mm1/sound/oss/dmasound/Kconfig.old 2007-01-04 19:07:04.000000000 +0100
+++ linux-2.6.20-rc2-mm1/sound/oss/dmasound/Kconfig 2007-01-04 19:07:28.000000000 +0100
@@ -14,7 +14,7 @@

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,