---

yaml --- r: 178640 b: refs/heads/master c: 6e5b08e h: refs/heads/master v: v3
git-mirror · Dec 27, 2009 · 2c17ecb · 2c17ecb
1 parent 2495902
commit 2c17ecb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 169220f88f0f26f4450ac0bc8ff0f807b453ec58
+refs/heads/master: 6e5b08ee941af38cfc6456158e7e04c1bc49306f
diff --git a/trunk/drivers/platform/x86/Kconfig b/trunk/drivers/platform/x86/Kconfig
@@ -231,6 +231,11 @@ config THINKPAD_ACPI
 
 	  This driver was formerly known as ibm-acpi.
 
+	  Extra functionality will be available if the rfkill (CONFIG_RFKILL)
+	  and/or ALSA (CONFIG_SND) subsystems are available in the kernel.
+	  Note that if you want ThinkPad-ACPI to be built-in instead of
+	  modular, ALSA and rfkill will also have to be built-in.
+
 	  If you have an IBM or Lenovo ThinkPad laptop, say Y or M here.
 
 config THINKPAD_ACPI_ALSA_SUPPORT