x86, olpc: Rename olpc-xo1 to olpc-xo1-pm

Based on earlier review comments, we'll no longer try to stick all of
our XO-1 goodies in a single driver. We'll split it into a power management
driver, and an EC/SCI driver.

As a first step, rename olpc-xo1 to olpc-xo1-pm, and make it builtin
instead of modular.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Link: http://lkml.kernel.org/r/1309019658-1712-4-git-send-email-dsd@laptop.org
Acked-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index da349723d41..29615ee688a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2073,11 +2073,12 @@ config OLPC
           Add support for detecting the unique features of the OLPC
           XO hardware.
 
-config OLPC_XO1
-        tristate "OLPC XO-1 support"
+config OLPC_XO1_PM
+        bool "OLPC XO-1 Power Management"
         depends on OLPC && MFD_CS5535
+        select MFD_CORE
         ---help---
-          Add support for non-essential features of the OLPC XO-1 laptop.
+          Add support for poweroff of the OLPC XO-1 laptop.
 
 endif # X86_32