ARM: at91: sam9g20ek/9m10g45ek/stam9g20: unbreak build

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@sunsite.dk>
[nicolas.ferre@atmel.com: change also -1 to -EINVAL for coherency]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index b3ec5e647a5c8e0b3686634e89839955283e1e9c..52d122d6db5c2fe0689f98a0b76137b296ffbe88 100644 (file)
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@ -217,7 +217,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         = -EINVAL,
        },
 
 };
@@ -237,7 +237,7 @@ static void __init ek_add_device_mmc(void)
        if (ek_have_2mmc()) {
                ek_mmc_data.slot[0].bus_width = 4;
                ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2;
-               ek_mmc_data.slot[0].wp_pin = -1;
+               ek_mmc_data.slot[0].wp_pin = -EINVAL;
        }
        at91_add_device_mci(0, &ek_mmc_data);
 #else

diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 3c36f9f6ab4009681b4264b37f9c846fef9a2df3..8e7d8ad3f5b081271b169c76239625c8561a563c 100644 (file)
--- 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         = -EINVAL,
        },
 };
 

diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
index 3c0cc869e91c016b2431aa4de00c5ffb004962e8..0bd51ee1cf1a2873ea1be8593e65bb4de6102018 100644 (file)
--- 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     = -EINVAL,
+               .wp_pin         = -EINVAL,
        },
 };
 #else