Subject: linux-next: manual merge of the extcon tree with the battery tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 25 May 2015 18:47:41 +1000

Hi Chanwoo,

Today's linux-next merge of the extcon tree got a conflict in
include/linux/mfd/axp20x.h between commit 843735b788a4 ("power:
axp288_charger: axp288 charger driver") from the battery tree and
commit f03123783d4e ("extcon: axp288: Add axp288 extcon driver
support") from the extcon tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc include/linux/mfd/axp20x.h
index 02f97dc568ac,4ed8071d062e..000000000000
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@@ -361,11 -275,9 +361,16 @@@ struct axp20x_fg_pdata 
  	int thermistor_curve[MAX_THERM_CURVE_SIZE][2];
  };
  
 +struct axp20x_chrg_pdata {
 +	int max_cc;
 +	int max_cv;
 +	int def_cc;
 +	int def_cv;
 +};
 +
+ struct axp288_extcon_pdata {
+ 	/* GPIO pin control to switch D+/D- lines b/w PMIC and SOC */
+ 	struct gpio_desc *gpio_mux_cntl;
+ };
+ 
  #endif /* __LINUX_MFD_AXP20X_H */