---

yaml --- r: 208627 b: refs/heads/master c: 556a460 h: refs/heads/master i: 208625: 45132c4 208623: 1909508 v: v3
git-mirror · Aug 5, 2010 · 70f0af6 · 70f0af6
1 parent 03d56e0
commit 70f0af6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ae807c581338bc7d0b870bfb4c8caac3772ca64
+refs/heads/master: 556a460e5d99eddc1a37bf689108d14f5d7e7668
diff --git a/trunk/arch/arm/mach-pxa/Kconfig b/trunk/arch/arm/mach-pxa/Kconfig
@@ -682,7 +682,6 @@ config SHARPSL_PM
 
 config SHARPSL_PM_MAX1111
 	bool
-	depends on !CORGI_SSP_DEPRECATED
 	select HWMON
 	select SENSORS_MAX1111
 

diff --git a/trunk/arch/arm/mach-pxa/sharpsl_pm.c b/trunk/arch/arm/mach-pxa/sharpsl_pm.c
@@ -180,17 +180,12 @@ int sharpsl_pm_pxa_read_max1111(int channel)
 	if (machine_is_tosa())
 	    return 0;
 
-#ifdef CONFIG_CORGI_SSP_DEPRECATED
-	return corgi_ssp_max1111_get((channel << MAXCTRL_SEL_SH) | MAXCTRL_PD0 | MAXCTRL_PD1
-			| MAXCTRL_SGL | MAXCTRL_UNI | MAXCTRL_STR);
-#else
 	extern int max1111_read_channel(int);
 
 	/* max1111 accepts channels from 0-3, however,
 	 * it is encoded from 0-7 here in the code.
 	 */
 	return max1111_read_channel(channel >> 1);
-#endif
 }
 
 static int get_percentage(int voltage)