Merge remote-tracking branch 'regulator/topic/delay' into regulator-next

71c2dca1 · Mark Brown · 59aedb6d · 1586bb4a · 71c2dca1 · 71c2dca1
Commit 71c2dca1 authored Jul 01, 2013 by Mark Brown
Showing with 0 additions and 3 deletions

drivers/regulator/lp8755.c drivers/regulator/lp8755.c +0 -1

drivers/regulator/max77686.c drivers/regulator/max77686.c +0 -1

drivers/regulator/s2mps11.c drivers/regulator/s2mps11.c +0 -1

No files found.
--- a/drivers/regulator/lp8755.c
+++ b/drivers/regulator/lp8755.c
@@ -19,7 +19,6 @@
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
 #include <linux/regmap.h>
-#include <linux/delay.h>
 #include <linux/uaccess.h>
 #include <linux/regulator/driver.h>
 #include <linux/regulator/machine.h>

--- a/drivers/regulator/max77686.c
+++ b/drivers/regulator/max77686.c
@@ -24,7 +24,6 @@

 #include <linux/kernel.h>
 #include <linux/bug.h>
-#include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>

--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -12,7 +12,6 @@
 */

 #include <linux/bug.h>
-#include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>