diff options
author | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-24 06:50:29 -0500 |
commit | e70049b9e74267dd47e1ffa62302073487afcb48 (patch) | |
tree | 2cd000c0751ef31c9044b020d63f278cdf4f332d /drivers/platform/x86/Kconfig | |
parent | d18921a0e319ab512f8186b1b1142c7b8634c779 (diff) | |
parent | f7e603ad8f78cd3b59e33fa72707da0cbabdf699 (diff) |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/platform/x86/Kconfig')
-rw-r--r-- | drivers/platform/x86/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 94363115a42a..b3866ad50227 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -62,6 +62,7 @@ config DELL_LAPTOP | |||
62 | depends on EXPERIMENTAL | 62 | depends on EXPERIMENTAL |
63 | depends on BACKLIGHT_CLASS_DEVICE | 63 | depends on BACKLIGHT_CLASS_DEVICE |
64 | depends on RFKILL | 64 | depends on RFKILL |
65 | depends on POWER_SUPPLY | ||
65 | default n | 66 | default n |
66 | ---help--- | 67 | ---help--- |
67 | This driver adds support for rfkill and backlight control to Dell | 68 | This driver adds support for rfkill and backlight control to Dell |
@@ -301,6 +302,7 @@ config INTEL_MENLOW | |||
301 | config EEEPC_LAPTOP | 302 | config EEEPC_LAPTOP |
302 | tristate "Eee PC Hotkey Driver (EXPERIMENTAL)" | 303 | tristate "Eee PC Hotkey Driver (EXPERIMENTAL)" |
303 | depends on ACPI | 304 | depends on ACPI |
305 | depends on INPUT | ||
304 | depends on EXPERIMENTAL | 306 | depends on EXPERIMENTAL |
305 | select BACKLIGHT_CLASS_DEVICE | 307 | select BACKLIGHT_CLASS_DEVICE |
306 | select HWMON | 308 | select HWMON |