Browse Source

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

Mark Brown 12 years ago
parent
commit
71c2dca1ff
3 changed files with 0 additions and 3 deletions
  1. 0 1
      drivers/regulator/lp8755.c
  2. 0 1
      drivers/regulator/max77686.c
  3. 0 1
      drivers/regulator/s2mps11.c

+ 0 - 1
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>

+ 0 - 1
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>

+ 0 - 1
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>