summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2010-03-09 03:34:27 +0100
committerEric Miao <eric.y.miao@gmail.com>2010-03-22 05:03:07 +0100
commit6533be390b1210285854fb2fc7ea80c0ada60b13 (patch)
treec2c46eed3cfdc97c723964a5de618407bf4402c7 /arch/arm
parent[ARM] pxa: remove unnecessary 'select FB_W100' from some platforms (diff)
downloadlinux-6533be390b1210285854fb2fc7ea80c0ada60b13.tar.xz
linux-6533be390b1210285854fb2fc7ea80c0ada60b13.zip
[ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm
sharpsl_pm.c actually depends on max1111 driver being built-in when not using legacy ssp code. Reported-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index c5b2f0abf456..5b6ee46fa7f6 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/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