aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorAdrian Bunk2007-02-10 01:45:50 -0800
committerLinus Torvalds2007-02-11 10:51:31 -0800
commit5aab0ad5ed82d6be5173f5d2e9da6be9c1e84a9c (patch)
tree4a35228213d4d1f41d066a574edbb6b5f13a9cf0 /sound
parent77adbfbf4cf96fedf9b75bb330704828c187b190 (diff)
[PATCH] schedule obsolete OSS drivers for removal, 3rd round
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 <bunk@stusta.de> Acked-By: Thomas Sailer <sailer@ife.ee.ethz.ch> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/Kconfig16
-rw-r--r--sound/oss/dmasound/Kconfig2
2 files changed, 16 insertions, 2 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index a0588c21324a..7ef2e2ba4484 100644
--- a/sound/oss/Kconfig
+++ b/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 <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_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 --git a/sound/oss/dmasound/Kconfig b/sound/oss/dmasound/Kconfig
index cb845580fe03..18e149f52a88 100644
--- a/sound/oss/dmasound/Kconfig
+++ b/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,