Merge remote-tracking branch 'regulator/topic/lp8788' into regulator-next
Mark Brown [Mon, 10 Dec 2012 03:42:57 +0000 (12:42 +0900)]
1  2 
drivers/regulator/lp8788-buck.c
drivers/regulator/lp8788-ldo.c

Simple merge
@@@ -708,11 -700,10 +700,10 @@@ static int lp8788_config_ldo_enable_mod
        return ret;
  
  set_default_ldo_enable_mode:
-       return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id],
-                               val[enable_id]);
+       return lp8788_update_bits(lp, LP8788_EN_SEL, en_mask[enable_id], 0);
  }
  
 -static __devinit int lp8788_dldo_probe(struct platform_device *pdev)
 +static int lp8788_dldo_probe(struct platform_device *pdev)
  {
        struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
        int id = pdev->id;