Merge branch 'sony-laptop' into release

git-mirror · Apr 5, 2009 · 7c27fd1 · 7c27fd1
2 parents 336d63b + 16dd55f
commit 7c27fd1
Show file tree

Hide file tree

Showing 3 changed files with 402 additions and 138 deletions.
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
@@ -165,6 +165,7 @@ config SONY_LAPTOP
 	depends on ACPI
 	select BACKLIGHT_CLASS_DEVICE
 	depends on INPUT
+	depends on RFKILL
 	  ---help---
 	  This mini-driver drives the SNC and SPIC devices present in the ACPI
 	  BIOS of the Sony Vaio laptops.