aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/sharpsl_pm.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-pxa/sharpsl_pm.c')
-rw-r--r--arch/arm/mach-pxa/sharpsl_pm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c
index 9427d8088395..f0845c1b001c 100644
--- a/arch/arm/mach-pxa/sharpsl_pm.c
+++ b/arch/arm/mach-pxa/sharpsl_pm.c
@@ -132,16 +132,16 @@ int sharpsl_pm_pxa_read_max1111(int channel)
132 if (machine_is_tosa()) // Ugly, better move this function into another module 132 if (machine_is_tosa()) // Ugly, better move this function into another module
133 return 0; 133 return 0;
134 134
135#ifdef CONFIG_SENSORS_MAX1111 135#ifdef CONFIG_CORGI_SSP_DEPRECATED
136 return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
137 | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
138#else
136 extern int max1111_read_channel(int); 139 extern int max1111_read_channel(int);
137 140
138 /* max1111 accepts channels from 0-3, however, 141 /* max1111 accepts channels from 0-3, however,
139 * it is encoded from 0-7 here in the code. 142 * it is encoded from 0-7 here in the code.
140 */ 143 */
141 return max1111_read_channel(channel >> 1); 144 return max1111_read_channel(channel >> 1);
142#else
143 return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
144 | MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
145#endif 145#endif
146} 146}
147 147