summaryrefslogtreecommitdiff
path: root/sound/core/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-11-02 09:00:37 +0100
committerTakashi Iwai <tiwai@suse.de>2015-11-02 09:00:37 +0100
commitbc88c9e923819b02f8cfaec1bb80d7e5530c0ac5 (patch)
tree1731a322d153ee18017822a8fd66295a0ec7a4e2 /sound/core/Kconfig
parentcadd16ea33a938d49aee99edd4758cc76048b399 (diff)
parent2c8d08925272b9be383cd81f1973c6faf9fbf53a (diff)
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/core/Kconfig')
-rw-r--r--sound/core/Kconfig13
1 files changed, 12 insertions, 1 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 6c96feeaf01e..e3e949126a56 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -4,7 +4,7 @@ config SND_TIMER
config SND_PCM
tristate
- select SND_TIMER
+ select SND_TIMER if SND_PCM_TIMER
config SND_PCM_ELD
bool
@@ -93,6 +93,17 @@ config SND_PCM_OSS_PLUGINS
support conversion of channels, formats and rates. It will
behave like most of new OSS/Free drivers in 2.4/2.6 kernels.
+config SND_PCM_TIMER
+ bool "PCM timer interface" if EXPERT
+ default y
+ help
+ If you disable this option, pcm timer will be inavailable, so
+ those stubs used pcm timer (e.g. dmix, dsnoop & co) may work
+ incorrectlly.
+
+ For some embedded device, we may disable it to reduce memory
+ footprint, about 20KB on x86_64 platform.
+
config SND_SEQUENCER_OSS
bool "OSS Sequencer API"
depends on SND_SEQUENCER