aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2009-01-09 03:36:53 -0500
committerLen Brown <len.brown@intel.com>2009-01-09 03:36:53 -0500
commit39cecf2091f10c3a5052d1e58da690d20852b243 (patch)
treead08d9643079be967182e6732a380a0ca5086975 /drivers/misc
parent38f64c771bece2cdbd72ed733e6fc8f2e279a7c1 (diff)
parentd9447183366ce849d7483bbd369752ac748e0422 (diff)
Merge branch 'asus-eeepc' into release
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/Kconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index fee7304102af..d9aac2e65391 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -428,10 +428,10 @@ config EEEPC_LAPTOP
428 tristate "Eee PC Hotkey Driver (EXPERIMENTAL)" 428 tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
429 depends on X86 429 depends on X86
430 depends on ACPI 430 depends on ACPI
431 depends on BACKLIGHT_CLASS_DEVICE
432 depends on HWMON
433 depends on EXPERIMENTAL 431 depends on EXPERIMENTAL
434 depends on RFKILL 432 select BACKLIGHT_CLASS_DEVICE
433 select HWMON
434 select RFKILL
435 ---help--- 435 ---help---
436 This driver supports the Fn-Fx keys on Eee PC laptops. 436 This driver supports the Fn-Fx keys on Eee PC laptops.
437 It also adds the ability to switch camera/wlan on/off. 437 It also adds the ability to switch camera/wlan on/off.