diff options
author | Daniel Drake <dsd@laptop.org> | 2010-10-10 05:40:32 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-10-12 20:31:15 -0400 |
commit | bf1ebf007911d70a89de9a4a1b36d403e8eb064b (patch) | |
tree | 2bd9a4046c1194354e859d73c7b42bed2f2de163 /arch/x86/Kconfig | |
parent | 286e5b97eb22baab9d9a41ca76c6b933a484252c (diff) |
x86, olpc: Add XO-1 poweroff support
Add a pm_power_off handler for the OLPC XO-1 laptop.
The driver can be built modular and follows the behaviour of the
APM driver, setting pm_power_off to NULL on unload. However, the
ability to unload the module will probably be removed (with a simple
__module_get(THIS_MODULE)) if/when XO-1 suspend/resume support is
added to this file at a later date.
Signed-off-by: Daniel Drake <dsd@laptop.org>
LKML-Reference: <20101010094032.9AE669D401B@zog.reactivated.net>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c25525571347..0bcb8765b1c0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -2066,6 +2066,12 @@ config OLPC | |||
2066 | Add support for detecting the unique features of the OLPC | 2066 | Add support for detecting the unique features of the OLPC |
2067 | XO hardware. | 2067 | XO hardware. |
2068 | 2068 | ||
2069 | config OLPC_XO1 | ||
2070 | tristate "OLPC XO-1 support" | ||
2071 | depends on OLPC | ||
2072 | ---help--- | ||
2073 | Add support for non-essential features of the OLPC XO-1 laptop. | ||
2074 | |||
2069 | config OLPC_OPENFIRMWARE | 2075 | config OLPC_OPENFIRMWARE |
2070 | bool "Support for OLPC's Open Firmware" | 2076 | bool "Support for OLPC's Open Firmware" |
2071 | depends on !X86_64 && !X86_PAE | 2077 | depends on !X86_64 && !X86_PAE |