From 62099ba5b2467303164c3639ed7a5438c96eb89c Mon Sep 17 00:00:00 2001
From: Eric Miao <eric.y.miao@gmail.com>
Date: Tue, 9 Mar 2010 10:34:27 +0800
Subject: [PATCH] --- yaml --- r: 189013 b: refs/heads/master c:
 6533be390b1210285854fb2fc7ea80c0ada60b13 h: refs/heads/master i:   189011:
 64a59750f8c7f8f748596106666344dd0e5a85ee v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-pxa/Kconfig | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e7e03bec7513..16c37e1eec05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fe2b6b527779ca966bc285dc27f84835bc1591a
+refs/heads/master: 6533be390b1210285854fb2fc7ea80c0ada60b13
diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
index c5b2f0abf456..5b6ee46fa7f6 100644
--- a/trunk/arch/arm/mach-pxa/Kconfig
+++ b/trunk/arch/arm/mach-pxa/Kconfig
@@ -453,6 +453,13 @@ config PXA_SHARPSL
 config SHARPSL_PM
 	bool
 	select APM_EMULATION
+	select SHARPSL_PM_MAX1111
+
+config SHARPSL_PM_MAX1111
+	bool
+	depends on !CORGI_SSP_DEPRECATED
+	select HWMON
+	select SENSORS_MAX1111
 
 config CORGI_SSP_DEPRECATED
 	bool