From 70f0af66a84dcdbae38acc38e7ab443ac29f9a61 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Sun, 4 Jul 2010 23:28:23 +0800 Subject: [PATCH] --- yaml --- r: 208627 b: refs/heads/master c: 556a460e5d99eddc1a37bf689108d14f5d7e7668 h: refs/heads/master i: 208625: 45132c433df4f56ae1874697ca72bc57b2899e2d 208623: 1909508df2fd4ee4f0b426ae3d49eb844acb17db v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/Kconfig | 1 - trunk/arch/arm/mach-pxa/sharpsl_pm.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 63fcd3ab8e81..c5aa5019e9f6 100644 --- 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 index 2bd33ff7d5fc..21d12246c5e1 100644 --- 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 index 582701e5337f..d8c5301294c8 100644 --- 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)