diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-07-28 14:05:36 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-07-29 15:32:06 -0400 |
commit | 0d94e41abe271c86df06bcf72d24f9ca7ce771f0 (patch) | |
tree | 6810d9b350d2fc8b0579d082206587f07bea5d96 | |
parent | e76d8ceaaff9d7fc1ba2b1963a9f34151832223b (diff) |
ALSA: Build jack detection
Since jack detection requires the input subsystem which may not be
desired on small systems it is not built unless required by a driver
that is being built. Drivers using jack detection should use a pattern
like this:
config SND_FOO
tristate "..."
...
select SND_JACK if INPUT=y || INPUT=SND
to ensure that the jack detection API is enabled if the input subsystem
is. If the input subsystem is not enabled then a stub version of the
API is provided.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
-rw-r--r-- | sound/core/Kconfig | 6 | ||||
-rw-r--r-- | sound/core/Makefile | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index 335d45ecde6a..9c4da1cd4a6b 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
@@ -12,6 +12,12 @@ config SND_HWDEP | |||
12 | config SND_RAWMIDI | 12 | config SND_RAWMIDI |
13 | tristate | 13 | tristate |
14 | 14 | ||
15 | # To be effective this also requires INPUT - users should say: | ||
16 | # select SND_JACK if INPUT=y || INPUT=SND | ||
17 | # to avoid having to force INPUT on. | ||
18 | config SND_JACK | ||
19 | bool | ||
20 | |||
15 | config SND_SEQUENCER | 21 | config SND_SEQUENCER |
16 | tristate "Sequencer support" | 22 | tristate "Sequencer support" |
17 | select SND_TIMER | 23 | select SND_TIMER |
diff --git a/sound/core/Makefile b/sound/core/Makefile index da8e685eef9c..d57125a5687d 100644 --- a/sound/core/Makefile +++ b/sound/core/Makefile | |||
@@ -7,6 +7,7 @@ snd-y := sound.o init.o memory.o info.o control.o misc.o device.o | |||
7 | snd-$(CONFIG_ISA_DMA_API) += isadma.o | 7 | snd-$(CONFIG_ISA_DMA_API) += isadma.o |
8 | snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o | 8 | snd-$(CONFIG_SND_OSSEMUL) += sound_oss.o info_oss.o |
9 | snd-$(CONFIG_SND_VMASTER) += vmaster.o | 9 | snd-$(CONFIG_SND_VMASTER) += vmaster.o |
10 | snd-$(CONFIG_SND_JACK) += jack.o | ||
10 | 11 | ||
11 | snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ | 12 | snd-pcm-objs := pcm.o pcm_native.o pcm_lib.o pcm_timer.o pcm_misc.o \ |
12 | pcm_memory.o | 13 | pcm_memory.o |