Prev: gpio: introduce f71808e_gpio driver for F71808E Super I/O chip.
Next: USB: gadget: mass storage: use proper device class in device desc
From: Kristoffer Ericson on 1 Jul 2010 06:10
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 <siccegge(a)cs.fau.de>

Cant see anything wrong with this.

acked-by: Kristoffer Ericson <kristoffer.ericson(a)gmail.com>

> ---
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Eric Miao on 4 Jul 2010 12:00
On Thu, Jul 1, 2010 at 5:58 PM, Kristoffer Ericson
<kristoffer.ericson(a)gmail.com> wrote:
> 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 <siccegge(a)cs.fau.de>
>
> Cant see anything wrong with this.
>
> acked-by: Kristoffer Ericson <kristoffer.ericson(a)gmail.com>
>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: gpio: introduce f71808e_gpio driver for F71808E Super I/O chip.
Next: USB: gadget: mass storage: use proper device class in device desc