linux-kernel - Re: linux-next: manual merge of the fbdev tree with the omap tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 13 Jan 2011 10:06:34 -0600
From:	Nishanth Menon <nm@...com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>,
	Koen Kooi <koen@...gleboard.org>,
	Tomi Valkeinen <tomi.valkeinen@...ia.com>
CC:	Paul Mundt <lethal@...ux-sh.org>, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org, Tony Lindgren <tony@...mide.com>,
	Bryan Wu <bryan.wu@...onical.com>
Subject: Re: linux-next: manual merge of the fbdev tree with the omap tree

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/