diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-20 11:40:43 -0500 |
| commit | 3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2 (patch) | |
| tree | 2cd8a8d61f350aa3b00e6b0afc998544923f183e /drivers/platform/x86/Kconfig | |
| parent | 9be1b56a3e718aa998772019c57c398dbb19e258 (diff) | |
| parent | 07a66d7c53a538e1a9759954a82bb6c07365eff9 (diff) | |
Merge branch 'x86/urgent' into x86/core
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 |