diff options
| author | Daniel Drake <dsd@laptop.org> | 2011-06-25 17:34:10 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-07-06 14:44:28 -0700 |
| commit | a3128588b3c6be634a9013a375903e0b55668f0a (patch) | |
| tree | 7889b876bf0188f4eff3b7b50cfdc15273a6180e /arch/x86/Kconfig | |
| parent | 7a0d4fcf6d4b80b30503fd2701eeef1883e11404 (diff) | |
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>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 7 |
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 |