[PATCH 1/3] sam9g20ek/9m10g45ek/stam9g20: unbreak build after 'use -EINVAL for invalid gpio'

Nicolas Ferre nicolas.ferre at atmel.com
Fri Oct 7 04:40:27 EDT 2011


On 10/06/2011 05:39 PM, Peter Korsgaard :
> Commit 36706ab70b26 (ARM: at91/boards: use -EINVAL for invalid gpio)
> broke the build as it used ';' rather than ',' in structure initializers.
> 
> Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>

OMG...

Thanks a lot Peter. I include it immediately in at91-l2 and at91-next!

Signed-off-by: Nicolas Ferre <nicolas.ferre at atmel.com>

Best regards,

> ---
>  arch/arm/mach-at91/board-sam9g20ek.c    |    2 +-
>  arch/arm/mach-at91/board-sam9m10g45ek.c |    2 +-
>  arch/arm/mach-at91/board-stamp9g20.c    |    4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
> index 1c6dfbb..27943c2 100644
> --- a/arch/arm/mach-at91/board-sam9g20ek.c
> +++ b/arch/arm/mach-at91/board-sam9g20ek.c
> @@ -212,7 +212,7 @@ static struct mci_platform_data __initdata ek_mmc_data = {
>  	.slot[1] = {
>  		.bus_width	= 4,
>  		.detect_pin	= AT91_PIN_PC9,
> -		.wp_pin		= -1;
> +		.wp_pin		= -1,
>  	},
>  
>  };
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index 3d68ead..008088a 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -100,7 +100,7 @@ static struct mci_platform_data __initdata mci0_data = {
>  	.slot[0] = {
>  		.bus_width	= 4,
>  		.detect_pin	= AT91_PIN_PD10,
> -		.wp_pin		= -1;
> +		.wp_pin		= -1,
>  	},
>  };
>  
> diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
> index 3c0cc86..cb4a840 100644
> --- a/arch/arm/mach-at91/board-stamp9g20.c
> +++ b/arch/arm/mach-at91/board-stamp9g20.c
> @@ -123,8 +123,8 @@ static void __init add_device_nand(void)
>  static struct mci_platform_data __initdata mmc_data = {
>  	.slot[0] = {
>  		.bus_width	= 4,
> -		.detect_pin	= -1;
> -		.wp_pin		= -1;
> +		.detect_pin	= -1,
> +		.wp_pin		= -1,
>  	},
>  };
>  #else


-- 
Nicolas Ferre



More information about the linux-arm-kernel mailing list