linux-next: manual merge of the tip tree with the drm tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/x86/platform/mrst/mrst.c between commit 026abc333205 ("gma500:
initial medfield merge") from the drm tree and commit ecfdb0ac15ba
("x86/mrst: Add msic_thermal platform support") from the tip 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/x86/platform/mrst/mrst.c
index b930cc4,721e652..0000000
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@@ -688,19 -670,11 +672,24 @@@ static void *msic_ocd_platform_data(voi
  	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_OCD);
  }
  
 +/* tc35876x DSI-LVDS bridge chip and panel platform data */
 +static void *tc35876x_platform_data(void *data)
 +{
 +       static struct tc35876x_platform_data pdata;
 +
 +       /* gpio pins set to -1 will not be used by the driver */
 +       pdata.gpio_bridge_reset = get_gpio_by_name("LCMB_RXEN");
 +       pdata.gpio_panel_bl_en = get_gpio_by_name("6S6P_BL_EN");
 +       pdata.gpio_panel_vadd = get_gpio_by_name("EN_VREG_LCD_V3P3");
 +
 +       return &pdata;
 +}
 +
+ static void *msic_thermal_platform_data(void *info)
+ {
+ 	return msic_generic_platform_data(info, INTEL_MSIC_BLOCK_THERMAL);
+ }
+ 
  static const struct devs_id __initconst device_ids[] = {
  	{"bma023", SFI_DEV_TYPE_I2C, 1, &no_platform_data},
  	{"pmic_gpio", SFI_DEV_TYPE_SPI, 1, &pmic_gpio_platform_data},

Attachment: pgp00000.pgp
Description: PGP signature