From ef1f7f21e0d4ddaa2f8e316b675c899d90a94540 Mon Sep 17 00:00:00 2001
From: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
Date: Wed, 26 May 2010 12:00:10 -0300
Subject: [PATCH] --- yaml --- r: 202438 b: refs/heads/master c:
 f35843ed8d17562f7c5da4b34a4a81b0cc450e9e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/platform/x86/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 408bd9e67d09..e7a28cf2ceb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fc8f274aef03bbe85774ba30e75deb58e8a90ff
+refs/heads/master: f35843ed8d17562f7c5da4b34a4a81b0cc450e9e
diff --git a/trunk/drivers/platform/x86/Kconfig b/trunk/drivers/platform/x86/Kconfig
index 3e1b8a288719..fe7d67058eb8 100644
--- a/trunk/drivers/platform/x86/Kconfig
+++ b/trunk/drivers/platform/x86/Kconfig
@@ -520,6 +520,7 @@ config TOSHIBA_BT_RFKILL
 config ACPI_CMPC
 	tristate "CMPC Laptop Extras"
 	depends on X86 && ACPI
+	depends on RFKILL || RFKILL=n
 	select INPUT
 	select BACKLIGHT_CLASS_DEVICE
 	default n