aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/Kconfig
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2009-12-26 19:52:15 -0500
committerLen Brown <len.brown@intel.com>2009-12-26 22:37:35 -0500
commitff850c339a1a6a7724537160c73cdc09a483fc5d (patch)
tree219086f3b031107f9a52d88b4b447b193be58363 /drivers/platform/x86/Kconfig
parent74c75c1848b618f6717c1be887ad539ffac2e96d (diff)
thinkpad-acpi: make volume subdriver optional
Allow the user to choose through Kconfig if the Console Audio Control interface (aka "volume subdriver") should be available or not. This not only saves some memory, but also allows the thinkpad-acpi driver to be built-in even if ALSA is modular when the console audio control interface is not wanted. This change fixes a build problem that is causing some annoyances, in a way that doesn't disable the entire driver on kernels without ALSA support. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Cc: Ingo Molnar <mingo@elte.hu> Cc: Amerigo Wang <amwang@redhat.com> Cc: Helight Xu <helight.xu@gmail.com> Cc: Takashi Iwai <tiwai@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform/x86/Kconfig')
-rw-r--r--drivers/platform/x86/Kconfig23
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index ec4faffe6b05..2462dc30b39b 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -233,6 +233,29 @@ config THINKPAD_ACPI
233 233
234 If you have an IBM or Lenovo ThinkPad laptop, say Y or M here. 234 If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
235 235
236config THINKPAD_ACPI_ALSA_SUPPORT
237 bool "Console audio control ALSA interface"
238 depends on THINKPAD_ACPI
239 depends on SND
240 depends on SND = y || THINKPAD_ACPI = SND
241 default y
242 ---help---
243 Enables monitoring of the built-in console audio output control
244 (headphone and speakers), which is operated by the mute and (in
245 some ThinkPad models) volume hotkeys.
246
247 If this option is enabled, ThinkPad-ACPI will export an ALSA card
248 with a single read-only mixer control, which should be used for
249 on-screen-display feedback purposes by the Desktop Environment.
250
251 Optionally, the driver will also allow software control (the
252 ALSA mixer will be made read-write). Please refer to the driver
253 documentation for details.
254
255 All IBM models have both volume and mute control. Newer Lenovo
256 models only have mute control (the volume hotkeys are just normal
257 keys and volume control is done through the main HDA mixer).
258
236config THINKPAD_ACPI_DEBUGFACILITIES 259config THINKPAD_ACPI_DEBUGFACILITIES
237 bool "Maintainer debug facilities" 260 bool "Maintainer debug facilities"
238 depends on THINKPAD_ACPI 261 depends on THINKPAD_ACPI