linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Bolle <pebolle@tiscali.nl>,
	linux-kernel@vger.kernel.org,
	Tomi Valkeinen <tomi.valkeinen@ti.com>,
	Archit Taneja <archit@ti.com>,
	linux-next@vger.kernel.org, Olof Johansson <olof@lixom.net>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: linux-next: manual merge of the arm-soc tree with the omap_dss2 tree
Date: Tue, 9 Apr 2013 11:32:01 +0200	[thread overview]
Message-ID: <201304091132.01771.arnd@arndb.de> (raw)
In-Reply-To: <20130409174047.c506479e08e9688c0a4ced9a@canb.auug.org.au>

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

  reply	other threads:[~2013-04-09  9:32 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-09  7:40 linux-next: manual merge of the arm-soc tree with the omap_dss2 tree Stephen Rothwell
2013-04-09  9:32 ` Arnd Bergmann [this message]
  -- strict thread matches above, loose matches on Subject: below --
2012-12-03  5:52 Stephen Rothwell
2012-11-30  5:18 Stephen Rothwell
2012-11-26 10:56 Stephen Rothwell
2012-11-26 15:53 ` Tony Lindgren
2012-09-24  9:53 Stephen Rothwell
2012-09-24 12:43 ` Arnd Bergmann
2012-09-24 13:11   ` Tomi Valkeinen
2012-09-24 16:19     ` Tony Lindgren
2012-09-17  9:23 Stephen Rothwell
2012-05-14  8:51 Stephen Rothwell
2012-03-13  8:21 Stephen Rothwell
2012-03-09  7:09 Stephen Rothwell
2012-03-08  6:00 Stephen Rothwell
2012-03-08 16:16 ` Arnd Bergmann
2012-03-09  9:35   ` Tomi Valkeinen
2012-03-09 11:50     ` Arnd Bergmann
2012-03-09 12:14       ` Tomi Valkeinen
2012-03-09 12:26         ` Arnd Bergmann
2012-03-09 12:31           ` Tomi Valkeinen
2012-03-08  5:58 Stephen Rothwell
2012-03-08  5:55 Stephen Rothwell
2012-03-08  5:51 Stephen Rothwell
2012-03-10  9:55 ` Janusz Krzysztofik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201304091132.01771.arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=archit@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=pebolle@tiscali.nl \
    --cc=sfr@canb.auug.org.au \
    --cc=tomi.valkeinen@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).