diff mbox series

sh: ecovec24: Fix an ifdef

Message ID 20181206120817.6151-1-linus.walleij@linaro.org
State New
Headers show
Series sh: ecovec24: Fix an ifdef | expand

Commit Message

Linus Walleij Dec. 6, 2018, 12:08 p.m. UTC
I managed to put the ifdef/else statements wrong when
registering the GPIO descriptor table for MMC CD/WP.
Fixing it up!

Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fixes: babd0b238d11 ("mmc: host: tmio: Use GPIO descriptors")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Ulf can you please apply this patch to the MMC "next" branch
(if noone is objecting) as I made the error there.
---
 arch/sh/boards/mach-ecovec24/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ulf Hansson Dec. 6, 2018, 1:31 p.m. UTC | #1
On Thu, 6 Dec 2018 at 13:08, Linus Walleij <linus.walleij@linaro.org> wrote:
>
> I managed to put the ifdef/else statements wrong when
> registering the GPIO descriptor table for MMC CD/WP.
> Fixing it up!

Applied for next, thanks!

Kind regards
Uffe

>
> Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> Fixes: babd0b238d11 ("mmc: host: tmio: Use GPIO descriptors")
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Ulf can you please apply this patch to the MMC "next" branch
> (if noone is objecting) as I made the error there.
> ---
>  arch/sh/boards/mach-ecovec24/setup.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
> index af2c28946319..058b168bdf26 100644
> --- a/arch/sh/boards/mach-ecovec24/setup.c
> +++ b/arch/sh/boards/mach-ecovec24/setup.c
> @@ -1460,9 +1460,9 @@ static int __init arch_setup(void)
>  #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
>         gpiod_add_lookup_table(&sdhi0_power_gpiod_table);
>         gpiod_add_lookup_table(&sdhi0_gpio_table);
> -#endif
>  #if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
>         gpiod_add_lookup_table(&sdhi1_gpio_table);
> +#endif
>  #endif
>
>         return platform_add_devices(ecovec_devices,
> --
> 2.19.2
>
diff mbox series

Patch

diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index af2c28946319..058b168bdf26 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -1460,9 +1460,9 @@  static int __init arch_setup(void)
 #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 	gpiod_add_lookup_table(&sdhi0_power_gpiod_table);
 	gpiod_add_lookup_table(&sdhi0_gpio_table);
-#endif
 #if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 	gpiod_add_lookup_table(&sdhi1_gpio_table);
+#endif
 #endif
 
 	return platform_add_devices(ecovec_devices,