diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-01 06:17:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-01 06:17:07 -0400 |
| commit | 71c2dca1ff46688fdf60f9f69dfa6bd9c8facfc0 (patch) | |
| tree | f7cb0cd3980ea302991371ba6bcad78ba846147f | |
| parent | 59aedb6df1f80cf9da7762a65450f616455898bb (diff) | |
| parent | 1586bb4a929688f2c5ba10b62eec6bd61eddaf6e (diff) | |
Merge remote-tracking branch 'regulator/topic/delay' into regulator-next
| -rw-r--r-- | drivers/regulator/lp8755.c | 1 | ||||
| -rw-r--r-- | drivers/regulator/max77686.c | 1 | ||||
| -rw-r--r-- | drivers/regulator/s2mps11.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/regulator/lp8755.c b/drivers/regulator/lp8755.c index f0f6ea05065b..d9e38b4c2adc 100644 --- a/drivers/regulator/lp8755.c +++ b/drivers/regulator/lp8755.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
| 21 | #include <linux/regmap.h> | 21 | #include <linux/regmap.h> |
| 22 | #include <linux/delay.h> | ||
| 23 | #include <linux/uaccess.h> | 22 | #include <linux/uaccess.h> |
| 24 | #include <linux/regulator/driver.h> | 23 | #include <linux/regulator/driver.h> |
| 25 | #include <linux/regulator/machine.h> | 24 | #include <linux/regulator/machine.h> |
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 20935b1a6ed4..f563057e5690 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/bug.h> | 26 | #include <linux/bug.h> |
| 27 | #include <linux/delay.h> | ||
| 28 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 29 | #include <linux/gpio.h> | 28 | #include <linux/gpio.h> |
| 30 | #include <linux/slab.h> | 29 | #include <linux/slab.h> |
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c index cd9ea2ea1826..c9f16e17920f 100644 --- a/drivers/regulator/s2mps11.c +++ b/drivers/regulator/s2mps11.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/bug.h> | 14 | #include <linux/bug.h> |
| 15 | #include <linux/delay.h> | ||
| 16 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 17 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
| 18 | #include <linux/slab.h> | 17 | #include <linux/slab.h> |