From: Nishanth Menon <nm@ti•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Koen Kooi <koen@beagleboard•org>,
Tomi Valkeinen <tomi.valkeinen@nokia•com>
Cc: Paul Mundt <lethal@linux-sh•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Tony Lindgren <tony@atomide•com>,
Bryan Wu <bryan.wu@canonical•com>
Subject: Re: linux-next: manual merge of the fbdev tree with the omap tree
Date: Thu, 13 Jan 2011 10:06:34 -0600 [thread overview]
Message-ID: <4D2F230A.4060401@ti.com> (raw)
In-Reply-To: <20110113125811.d651c695.sfr@canb.auug.org.au>
Stephen Rothwell had written, on 01/12/2011 07:58 PM, the following:
> Hi Paul,
>
> Today's linux-next merge of the fbdev tree got a conflict in
> arch/arm/mach-omap2/board-omap3beagle.c between commit
> f8362d215549c66066f78e67c033dd370ae50322 ("omap3: beaglexm: fix DVI reset
> GPIO") from the omap tree and commit
> 89747c9141cd750a610974d93f71492922b8cbd7 ("OMAP: use generic DPI panel
> driver in board files") from the fbdev tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
> diff --cc arch/arm/mach-omap2/board-omap3beagle.c
> index 2ed8040,a4fe8e1..0000000
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@@ -197,11 -204,10 +204,10 @@@ static struct panel_generic_dpi_data dv
> static struct omap_dss_device beagle_dvi_device = {
> .type = OMAP_DISPLAY_TYPE_DPI,
> .name = "dvi",
> - .driver_name = "generic_panel",
> + .driver_name = "generic_dpi_panel",
> + .data = &dvi_panel,
> .phy.dpi.data_lines = 24,
> - .reset_gpio = 170,
> + .reset_gpio = -EINVAL,
> - .platform_enable = beagle_enable_dvi,
> - .platform_disable = beagle_disable_dvi,
Thanks. Looks fine to me.
--
Regards,
Nishanth Menon
prev parent reply other threads:[~2011-01-13 16:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-13 1:58 linux-next: manual merge of the fbdev tree with the omap tree Stephen Rothwell
2011-01-13 16:06 ` Nishanth Menon [this message]
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=4D2F230A.4060401@ti.com \
--to=nm@ti$(echo .)com \
--cc=bryan.wu@canonical$(echo .)com \
--cc=koen@beagleboard$(echo .)org \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tomi.valkeinen@nokia$(echo .)com \
--cc=tony@atomide$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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