[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAMPhdO8JMKc8kfBRUPs=80as37z8Gavrt+EEOGYyGMUnG1WHbw@mail.gmail.com>
Date: Fri, 7 Oct 2011 11:47:15 +0800
From: Eric Miao <eric.y.miao@...il.com>
To: Arnd Bergmann <arnd@...db.de>
Cc: Russell King - ARM Linux <linux@....linux.org.uk>,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Jason Chagas <jason.chagas@...vell.com>,
Haojian Zhuang <haojian.zhuang@...vell.com>
Subject: Re: [PATCH 05/26] ARM: pxa: make zylonite_pxa*_init declaration match code
On Sun, Oct 2, 2011 at 4:03 AM, Arnd Bergmann <arnd@...db.de> wrote:
> When support for zylonite is disabled, the zylonite_pxa300_init
> and zylonite_pxa320_init functions are not there, but the declaration
> is still kept around if any other boards for the same soc are
> enabled. This changes the declaration to be conditional on the
> same symbol as the code.
>
> Signed-off-by: Arnd Bergmann <arnd@...db.de>
Applied.
> ---
> arch/arm/mach-pxa/include/mach/zylonite.h | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-pxa/include/mach/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h
> index ea24998..ecca976 100644
> --- a/arch/arm/mach-pxa/include/mach/zylonite.h
> +++ b/arch/arm/mach-pxa/include/mach/zylonite.h
> @@ -19,7 +19,7 @@ extern int wm9713_irq;
> extern int lcd_id;
> extern int lcd_orientation;
>
> -#ifdef CONFIG_CPU_PXA300
> +#ifdef CONFIG_MACH_ZYLONITE300
> extern void zylonite_pxa300_init(void);
> #else
> static inline void zylonite_pxa300_init(void)
> @@ -29,7 +29,7 @@ static inline void zylonite_pxa300_init(void)
> }
> #endif
>
> -#ifdef CONFIG_CPU_PXA320
> +#ifdef CONFIG_MACH_ZYLONITE320
> extern void zylonite_pxa320_init(void);
> #else
> static inline void zylonite_pxa320_init(void)
> --
> 1.7.5.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists