[PATCH 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask

[Paul Walmsley]

Hi Santosh

On Tue, 4 Jan 2011, Santosh Shilimkar wrote:

> struct clockdomain member clktrctrl_mask is available for only for OMAP2
> and OMAP3 architectures. Technially it is also used only for these archs
> but this breaks the build with custom OMAP4 configuration.
> 
>  CC      arch/arm/mach-omap2/clockdomain.o
> arch/arm/mach-omap2/clockdomain.c: In function '_enable_hwsup':
> arch/arm/mach-omap2/clockdomain.c:251: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c:254: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c: In function '_disable_hwsup':
> arch/arm/mach-omap2/clockdomain.c:277: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c:280: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_sleep':
> arch/arm/mach-omap2/clockdomain.c:744: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_wakeup':
> arch/arm/mach-omap2/clockdomain.c:789: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_enable':
> arch/arm/mach-omap2/clockdomain.c:922: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c:926: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_disable':
> arch/arm/mach-omap2/clockdomain.c:994: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> arch/arm/mach-omap2/clockdomain.c:998: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
> make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2
> 
> Fix the build break with use of ARCH_OMAP2PLUS instead of OMAP2 or OMAP3
> 
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
> Cc: Paul Walmsley <paul at pwsan.com>
> ---
>  arch/arm/mach-omap2/clockdomain.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h
> index de3faa2..6fa82f5 100644
> --- a/arch/arm/mach-omap2/clockdomain.h
> +++ b/arch/arm/mach-omap2/clockdomain.h
> @@ -103,7 +103,7 @@ struct clockdomain {
>  		const char *name;
>  		struct powerdomain *ptr;
>  	} pwrdm;
> -#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
> +#ifdef CONFIG_ARCH_OMAP2PLUS

No need for this, just drop the #ifdef...

>  	const u16 clktrctrl_mask;


- Paul