diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/oss/Kconfig | 16 | ||||
-rw-r--r-- | sound/oss/dmasound/Kconfig | 2 |
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 @@ | |||
5 | # | 5 | # |
6 | # Prompt user for primary drivers. | 6 | # Prompt user for primary drivers. |
7 | 7 | ||
8 | config OBSOLETE_OSS | ||
9 | bool "Obsolete OSS drivers" | ||
10 | depends on SOUND_PRIME | ||
11 | help | ||
12 | This option enables support for obsolete OSS drivers that | ||
13 | are scheduled for removal in the near future since there | ||
14 | are ALSA drivers for the same hardware. | ||
15 | |||
16 | Please contact Adrian Bunk <bunk@stusta.de> if you had to | ||
17 | say Y here because your soundcard is not properly supported | ||
18 | by ALSA. | ||
19 | |||
20 | If unsure, say N. | ||
21 | |||
8 | config SOUND_BT878 | 22 | config SOUND_BT878 |
9 | tristate "BT878 audio dma" | 23 | tristate "BT878 audio dma" |
10 | depends on SOUND_PRIME && PCI | 24 | depends on SOUND_PRIME && PCI |
@@ -33,7 +47,7 @@ config SOUND_BCM_CS4297A | |||
33 | 47 | ||
34 | config SOUND_ES1371 | 48 | config SOUND_ES1371 |
35 | tristate "Creative Ensoniq AudioPCI 97 (ES1371)" | 49 | tristate "Creative Ensoniq AudioPCI 97 (ES1371)" |
36 | depends on SOUND_PRIME && PCI | 50 | depends on SOUND_PRIME && PCI && OBSOLETE_OSS |
37 | help | 51 | help |
38 | Say Y or M if you have a PCI sound card utilizing the Ensoniq | 52 | Say Y or M if you have a PCI sound card utilizing the Ensoniq |
39 | ES1371 chipset, such as Ensoniq's AudioPCI97. To find out if | 53 | 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 | |||
14 | 14 | ||
15 | config DMASOUND_PMAC | 15 | config DMASOUND_PMAC |
16 | tristate "PowerMac DMA sound support" | 16 | tristate "PowerMac DMA sound support" |
17 | depends on PPC32 && PPC_PMAC && SOUND && I2C | 17 | depends on PPC32 && PPC_PMAC && SOUND && I2C && OBSOLETE_OSS |
18 | select DMASOUND | 18 | select DMASOUND |
19 | help | 19 | help |
20 | If you want to use the internal audio of your PowerMac in Linux, | 20 | If you want to use the internal audio of your PowerMac in Linux, |