From mboxrd@z Thu Jan 1 00:00:00 1970 From: kristoffer.ericson@gmail.com (Kristoffer Ericson) Date: Thu, 1 Jul 2010 11:58:13 +0200 Subject: [PATCH 25/33] Removing dead CORGI_SSP_DEPRECATED In-Reply-To: <80c10751fb5b7d9be55656ac35827a403a5d6b2b.1277911346.git.siccegge@cs.fau.de> References: <80c10751fb5b7d9be55656ac35827a403a5d6b2b.1277911346.git.siccegge@cs.fau.de> Message-ID: <20100701095812.GA1096@boggieman> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Jun 30, 2010 at 06:01:56PM +0200, Christoph Egger wrote: > CORGI_SSP_DEPRECATED doesn't exist in Kconfig, therefore removing all > references for it from the source code. > > Signed-off-by: Christoph Egger Cant see anything wrong with this. acked-by: Kristoffer Ericson > --- > arch/arm/mach-pxa/sharpsl_pm.c | 5 ----- > 1 files changed, 0 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c > index 582701e..d8c5301 100644 > --- a/arch/arm/mach-pxa/sharpsl_pm.c > +++ b/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) > -- > 1.7.0.4