aboutsummaryrefslogtreecommitdiffstats
path: root/sound/Kconfig
diff options
context:
space:
mode:
Diffstat (limited to 'sound/Kconfig')
-rw-r--r--sound/Kconfig9
1 files changed, 8 insertions, 1 deletions
diff --git a/sound/Kconfig b/sound/Kconfig
index a37bee094eba..200aca1faa71 100644
--- a/sound/Kconfig
+++ b/sound/Kconfig
@@ -28,6 +28,10 @@ menuconfig SOUND
28 28
29if SOUND 29if SOUND
30 30
31config SOUND_OSS_CORE
32 bool
33 default n
34
31source "sound/oss/dmasound/Kconfig" 35source "sound/oss/dmasound/Kconfig"
32 36
33if !M68K 37if !M68K
@@ -80,6 +84,7 @@ endif # SND
80 84
81menuconfig SOUND_PRIME 85menuconfig SOUND_PRIME
82 tristate "Open Sound System (DEPRECATED)" 86 tristate "Open Sound System (DEPRECATED)"
87 select SOUND_OSS_CORE
83 help 88 help
84 Say 'Y' or 'M' to enable Open Sound System drivers. 89 Say 'Y' or 'M' to enable Open Sound System drivers.
85 90
@@ -91,6 +96,9 @@ endif # SOUND_PRIME
91 96
92endif # !M68K 97endif # !M68K
93 98
99endif # SOUND
100
101# AC97_BUS is used from both sound and ucb1400
94config AC97_BUS 102config AC97_BUS
95 tristate 103 tristate
96 help 104 help
@@ -99,4 +107,3 @@ config AC97_BUS
99 sound although they're sharing the AC97 bus. Concerned drivers 107 sound although they're sharing the AC97 bus. Concerned drivers
100 should "select" this. 108 should "select" this.
101 109
102endif # SOUND