1 files changed, 40 insertions, 7 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index a67e014e4e4..153aa6f7829 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1737,8 +1737,8 @@ menuconfig APM
           machines with more than one CPU.
 
           In order to use APM, you will need supporting software. For location
-          and more information, read <file:Documentation/power/pm.txt> and the
-          Battery Powered Linux mini-HOWTO, available from
+          and more information, read <file:Documentation/power/apm-acpi.txt>
+          and the Battery Powered Linux mini-HOWTO, available from
           <http://www.tldp.org/docs.html#howto>.
 
           This driver does not spin down disk drives (see the hdparm(8)
@@ -2024,11 +2024,44 @@ config OLPC
           Add support for detecting the unique features of the OLPC
           XO hardware.
 
-config OLPC_XO1
-        tristate "OLPC XO-1 support"
-        depends on OLPC && MFD_CS5535
-        ---help---
-          Add support for non-essential features of the OLPC XO-1 laptop.
+config OLPC_XO1_PM
+        bool "OLPC XO-1 Power Management"
+        depends on OLPC && MFD_CS5535 && PM_SLEEP
+        select MFD_CORE
+        ---help---
+          Add support for poweroff and suspend of the OLPC XO-1 laptop.
+
+config OLPC_XO1_RTC
+        bool "OLPC XO-1 Real Time Clock"
+        depends on OLPC_XO1_PM && RTC_DRV_CMOS
+        ---help---
+          Add support for the XO-1 real time clock, which can be used as a
+          programmable wakeup source.
+
+config OLPC_XO1_SCI
+        bool "OLPC XO-1 SCI extras"
+        depends on OLPC && OLPC_XO1_PM
+        select POWER_SUPPLY
+        select GPIO_CS5535
+        select MFD_CORE
+        ---help---
+          Add support for SCI-based features of the OLPC XO-1 laptop:
+           - EC-driven system wakeups
+           - Power button
+           - Ebook switch
+           - Lid switch
+           - AC adapter status updates
+           - Battery status updates
+
+config OLPC_XO15_SCI
+        bool "OLPC XO-1.5 SCI extras"
+        depends on OLPC && ACPI
+        select POWER_SUPPLY
+        ---help---
+          Add support for SCI-based features of the OLPC XO-1.5 laptop:
+           - EC-driven system wakeups
+           - AC adapter status updates
+           - Battery status updates
 
 endif # X86_32