From: Eric Miao Date: Tue, 9 Mar 2010 02:34:27 +0000 (+0800) Subject: [ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pm X-Git-Tag: v2.6.34-rc3~35^2~2^2~5 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6533be390b1210285854fb2fc7ea80c0ada60b13;p=~shefty%2Frdma-dev.git [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 Signed-off-by: Eric Miao --- diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig index c5b2f0abf45..5b6ee46fa7f 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