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

diff --cc drivers/mfd/ab8500-core.c
Simple merge

diff --cc drivers/power/Makefile
Simple merge

diff --cc drivers/power/ab8500_btemp.c
index 20e2a7d3ef43c0f6877aae8e5b3cb9c08fc6a9ae,158cba5cff53b72a79f0262a853afa6f72faf81a..e1d28039ce7b0fdd4a636dfd0e6b5441bd9f41d4
--- 1/drivers/power/ab8500_btemp.c
--- 2/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 3be9c0ee3fc58a2c016cb9509ceb316c54312b5f,2ddface4b2c4af48c3b4095884a20c5d966b6420..e5755f0ba831a998f8d126c5683e5b41756af335
--- 1/drivers/power/ab8500_charger.c
--- 2/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 b3bf178c346270fdb22800c53ed21b574a25b956,df681a80d8a4adc9438e5dcfa7cd593de342d6e0..3d05c73813c8a594fcbc2ec220c063653c3d953b
--- 1/drivers/power/ab8500_fg.c
--- 2/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 2970891460641177f53449dc1ff32b33ed26a375,a8acfe5b863fa85a5078a4b72dca229cc32803ee..8b69da0ae5af76ac983830db7e0427a7e638146a
--- 1/drivers/power/abx500_chargalg.c
--- 2/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;