diff options
author | Tejun Heo <tj@kernel.org> | 2008-08-28 10:42:51 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-08-29 04:06:21 -0400 |
commit | d886e87cb82b0f6636476c1104bb84d7c8dc87d9 (patch) | |
tree | f44fe9eeb7fea8687f8d4fc34a2aad813293462c /sound/Kconfig | |
parent | 9f99a6386eb1ad1197a401495669315de2f19039 (diff) |
sound: make OSS sound core optional
sound/sound_core.c implements soundcore.ko and contains two parts -
sound_class which is shared by both ALSA and OSS and device
redirection support for OSS. It's always compiled when any sound
support is enabled although it's necessary only when OSS (the actual
one or emulation) is enabled. This is slightly wasteful and as device
redirection always registers character device region for major 14, it
prevents alternative implementation.
This patch introduces a new config SOUND_OSS_CORE which is selected
iff OSS support is actually necessary and build the OSS core part
conditionally.
If OSS is disabled, soundcore merely contains sound_class but leaving
it that way seems to be the simplest approach as otherwise sound_class
should be in ALSA core file if OSS is disabled but should be in
soundcore if OSS is enabled. Also, there's also the user confusion
factor.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/Kconfig')
-rw-r--r-- | sound/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/Kconfig b/sound/Kconfig index 8ebf512ced6c..200aca1faa71 100644 --- a/sound/Kconfig +++ b/sound/Kconfig | |||
@@ -28,6 +28,10 @@ menuconfig SOUND | |||
28 | 28 | ||
29 | if SOUND | 29 | if SOUND |
30 | 30 | ||
31 | config SOUND_OSS_CORE | ||
32 | bool | ||
33 | default n | ||
34 | |||
31 | source "sound/oss/dmasound/Kconfig" | 35 | source "sound/oss/dmasound/Kconfig" |
32 | 36 | ||
33 | if !M68K | 37 | if !M68K |
@@ -80,6 +84,7 @@ endif # SND | |||
80 | 84 | ||
81 | menuconfig SOUND_PRIME | 85 | menuconfig 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 | ||