From: Anton Vorontsov <anton@enomsg.org>
Date: Sun, 6 Jan 2013 01:14:22 +0000 (-0800)
Subject: Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500
X-Git-Tag: v3.9-rc1~151^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500
---

240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983
diff --cc drivers/power/ab8500_btemp.c
index 20e2a7d,158cba5..e1d2803
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@@ -964,9 -973,10 +973,10 @@@ static char *supply_interface[] = 
  	"ab8500_fg",
  };
  
 -static int __devinit ab8500_btemp_probe(struct platform_device *pdev)
 +static int ab8500_btemp_probe(struct platform_device *pdev)
  {
  	struct device_node *np = pdev->dev.of_node;
+ 	struct abx500_bm_data *plat = pdev->dev.platform_data;
  	struct ab8500_btemp *di;
  	int irq, i, ret = 0;
  	u8 val;
diff --cc drivers/power/ab8500_charger.c
index 3be9c0e,2ddface..e5755f0
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@@ -2538,9 -2633,10 +2633,10 @@@ static char *supply_interface[] = 
  	"ab8500_btemp",
  };
  
 -static int __devinit ab8500_charger_probe(struct platform_device *pdev)
 +static int ab8500_charger_probe(struct platform_device *pdev)
  {
  	struct device_node *np = pdev->dev.of_node;
+ 	struct abx500_bm_data *plat = pdev->dev.platform_data;
  	struct ab8500_charger *di;
  	int irq, i, charger_status, ret = 0;
  
diff --cc drivers/power/ab8500_fg.c
index b3bf178,df681a8..3d05c73
--- a/drivers/power/ab8500_fg.c
+++ b/drivers/power/ab8500_fg.c
@@@ -2445,9 -2445,10 +2445,10 @@@ static char *supply_interface[] = 
  	"ab8500_usb",
  };
  
 -static int __devinit ab8500_fg_probe(struct platform_device *pdev)
 +static int ab8500_fg_probe(struct platform_device *pdev)
  {
  	struct device_node *np = pdev->dev.of_node;
+ 	struct abx500_bm_data *plat = pdev->dev.platform_data;
  	struct ab8500_fg *di;
  	int i, irq;
  	int ret = 0;
diff --cc drivers/power/abx500_chargalg.c
index 2970891,a8acfe5..8b69da0
--- a/drivers/power/abx500_chargalg.c
+++ b/drivers/power/abx500_chargalg.c
@@@ -1803,9 -1803,10 +1803,10 @@@ static char *supply_interface[] = 
  	"ab8500_fg",
  };
  
 -static int __devinit abx500_chargalg_probe(struct platform_device *pdev)
 +static int abx500_chargalg_probe(struct platform_device *pdev)
  {
  	struct device_node *np = pdev->dev.of_node;
+ 	struct abx500_bm_data *plat = pdev->dev.platform_data;
  	struct abx500_chargalg *di;
  	int ret = 0;