diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-06-09 07:56:05 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-09 10:38:58 -0400 |
commit | eb3b705aaed9cab7efef8c905eda919b5fd902b9 (patch) | |
tree | 097486d9b914cf1965116fc5b7a12d6115ed0352 /sound | |
parent | 6baca010c71176f406299ea1949e721ab995ff01 (diff) |
ALSA: Make CONFIG_SND_OSSEMUL user-selectable
Currently CONFIG_SND_OSSEMUL is selected by each config like
CONFIG_SND_PCM_OSS. But, as see in the raw MIDI code that is built
conditionally with CONFIG_SND_OSSEMUL, we should rather make
CONFIG_SND_OSSEMUL user-selectable as the top kconfig item, and leave
the rest depending on it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/Kconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index 9749f9e8b45c..3a9afc520d4e 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
@@ -59,12 +59,14 @@ config SND_SEQ_DUMMY | |||
59 | will be called snd-seq-dummy. | 59 | will be called snd-seq-dummy. |
60 | 60 | ||
61 | config SND_OSSEMUL | 61 | config SND_OSSEMUL |
62 | bool "Enable OSS Emulation" | ||
62 | select SOUND_OSS_CORE | 63 | select SOUND_OSS_CORE |
63 | bool | 64 | help |
65 | This option enables the build of OSS emulation layer. | ||
64 | 66 | ||
65 | config SND_MIXER_OSS | 67 | config SND_MIXER_OSS |
66 | tristate "OSS Mixer API" | 68 | tristate "OSS Mixer API" |
67 | select SND_OSSEMUL | 69 | depends on SND_OSSEMUL |
68 | help | 70 | help |
69 | To enable OSS mixer API emulation (/dev/mixer*), say Y here | 71 | To enable OSS mixer API emulation (/dev/mixer*), say Y here |
70 | and read <file:Documentation/sound/alsa/OSS-Emulation.txt>. | 72 | and read <file:Documentation/sound/alsa/OSS-Emulation.txt>. |
@@ -76,7 +78,7 @@ config SND_MIXER_OSS | |||
76 | 78 | ||
77 | config SND_PCM_OSS | 79 | config SND_PCM_OSS |
78 | tristate "OSS PCM (digital audio) API" | 80 | tristate "OSS PCM (digital audio) API" |
79 | select SND_OSSEMUL | 81 | depends on SND_OSSEMUL |
80 | select SND_PCM | 82 | select SND_PCM |
81 | help | 83 | help |
82 | To enable OSS digital audio (PCM) emulation (/dev/dsp*), say Y | 84 | To enable OSS digital audio (PCM) emulation (/dev/dsp*), say Y |
@@ -110,7 +112,7 @@ config SND_PCM_TIMER | |||
110 | config SND_SEQUENCER_OSS | 112 | config SND_SEQUENCER_OSS |
111 | bool "OSS Sequencer API" | 113 | bool "OSS Sequencer API" |
112 | depends on SND_SEQUENCER | 114 | depends on SND_SEQUENCER |
113 | select SND_OSSEMUL | 115 | depends on SND_OSSEMUL |
114 | help | 116 | help |
115 | Say Y here to enable OSS sequencer emulation (both | 117 | Say Y here to enable OSS sequencer emulation (both |
116 | /dev/sequencer and /dev/music interfaces). | 118 | /dev/sequencer and /dev/music interfaces). |