git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sh: bzip2/lzma uImage support.
[safe/jmp/linux-2.6]
/
sound
/
Kconfig
diff --git
a/sound/Kconfig
b/sound/Kconfig
index
a37bee0
..
1eceb85
100644
(file)
--- a/
sound/Kconfig
+++ b/
sound/Kconfig
@@
-28,6
+28,10
@@
menuconfig SOUND
if SOUND
if SOUND
+config SOUND_OSS_CORE
+ bool
+ default n
+
source "sound/oss/dmasound/Kconfig"
if !M68K
source "sound/oss/dmasound/Kconfig"
if !M68K
@@
-56,6
+60,8
@@
source "sound/aoa/Kconfig"
source "sound/arm/Kconfig"
source "sound/arm/Kconfig"
+source "sound/atmel/Kconfig"
+
source "sound/spi/Kconfig"
source "sound/mips/Kconfig"
source "sound/spi/Kconfig"
source "sound/mips/Kconfig"
@@
-80,6
+86,7
@@
endif # SND
menuconfig SOUND_PRIME
tristate "Open Sound System (DEPRECATED)"
menuconfig SOUND_PRIME
tristate "Open Sound System (DEPRECATED)"
+ select SOUND_OSS_CORE
help
Say 'Y' or 'M' to enable Open Sound System drivers.
help
Say 'Y' or 'M' to enable Open Sound System drivers.
@@
-91,6
+98,9
@@
endif # SOUND_PRIME
endif # !M68K
endif # !M68K
+endif # SOUND
+
+# AC97_BUS is used from both sound and ucb1400
config AC97_BUS
tristate
help
config AC97_BUS
tristate
help
@@
-99,4
+109,3
@@
config AC97_BUS
sound although they're sharing the AC97 bus. Concerned drivers
should "select" this.
sound although they're sharing the AC97 bus. Concerned drivers
should "select" this.
-endif # SOUND