aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/Makefile
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2010-10-10 10:40:32 +0100
committerH. Peter Anvin <hpa@zytor.com>2010-10-12 17:31:15 -0700
commitbf1ebf007911d70a89de9a4a1b36d403e8eb064b (patch)
tree2bd9a4046c1194354e859d73c7b42bed2f2de163 /arch/x86/kernel/Makefile
parent286e5b97eb22baab9d9a41ca76c6b933a484252c (diff)
downloadmrst-s0i3-test-bf1ebf007911d70a89de9a4a1b36d403e8eb064b.tar.gz
mrst-s0i3-test-bf1ebf007911d70a89de9a4a1b36d403e8eb064b.tar.xz
mrst-s0i3-test-bf1ebf007911d70a89de9a4a1b36d403e8eb064b.zip
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/kernel/Makefile')
-rw-r--r--arch/x86/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 0925676266b..e9777791e39 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -104,6 +104,7 @@ obj-$(CONFIG_SCx200) += scx200.o
scx200-y += scx200_32.o
obj-$(CONFIG_OLPC) += olpc.o
+obj-$(CONFIG_OLPC_XO1) += olpc-xo1.o
obj-$(CONFIG_OLPC_OPENFIRMWARE) += olpc_ofw.o
obj-$(CONFIG_X86_MRST) += mrst.o