From: Thadeu Lima de Souza Cascardo Date: Wed, 26 May 2010 15:00:10 +0000 (-0300) Subject: classmate-laptop: depends on RFKILL or RFKILL=n X-Git-Tag: v2.6.35.12~20 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=79a03efd3311c204f22e92cdf1a4c0d63e1c759c;p=karo-tx-linux.git classmate-laptop: depends on RFKILL or RFKILL=n [ upstream commit f35843ed8d17562f7c5da4b34a4a81b0cc450e9e ] Randy Dunlap has reported that building classmate-laptop fails when CONFIG_RFKILL=m and CONFIG_ACPI_CMPC=y. He suggested depending on RFKILL, but, then, it will not be possible to select classmate-laptop when RFKILL is off. There's no known problem with building and using classmate-laptop with RFKILL off. So depend on RFKILL or RFKILL=n. Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Matthew Garrett Signed-off-by: Andi Kleen Reported-by: Randy Dunlap Cc: Randy Dunlap Cc: platform-driver-x86@vger.kernel.org Cc: Daniel Oliveira Nascimento --- diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 3e1b8a288719..fe7d67058eb8 100644 --- a/drivers/platform/x86/Kconfig +++ b/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