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

[Stephen Rothwell]

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.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

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,
  };
  
  static struct omap_dss_device beagle_tv_device = {
--
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/