Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree

From: Arnd Bergmann
Date: Tue Apr 09 2013 - 05:32:23 EST


On Tuesday 09 April 2013, Stephen Rothwell wrote:
>
> - #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)
> -static void __init sdp2430_display_init(void)
> -{
> - int r;
> -
> - static struct gpio gpios[] __initdata = {
> - { SDP2430_LCD_PANEL_ENABLE_GPIO, GPIOF_OUT_INIT_LOW,
> - "LCD reset" },
> - { SDP2430_LCD_PANEL_BACKLIGHT_GPIO, GPIOF_OUT_INIT_LOW,
> - "LCD Backlight" },
> - };
> -
> - r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
> - if (r) {
> - pr_err("Cannot request LCD GPIOs, error %d\n", r);
> - return;
> - }
> -
> - omap_display_init(&sdp2430_dss_data);
> -}
> -
> + #if IS_ENABLED(CONFIG_SMC91X)

Looks good, thanks!

Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/