diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 11:14:12 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 11:14:12 +0100 |
| commit | abca37cd2e12a898289f2392c1658e711005535b (patch) | |
| tree | 60453bb7fa783e86abea7b89ece8ed4aea9fe6ca /drivers/regulator/max77686.c | |
| parent | 8d0509e9d6e1303acb40f53f5158fceec46e86e7 (diff) | |
| parent | 1baa3b4e06f1e03f4fbbbc3734ea3b9a7a1134ec (diff) | |
Merge remote-tracking branch 'regulator/fix/s5m8767' into regulator-linus
Diffstat (limited to 'drivers/regulator/max77686.c')
| -rw-r--r-- | drivers/regulator/max77686.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 20935b1a6ed..f563057e569 100644 --- 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> |