diff options
| author | Mark Brown <broonie@kernel.org> | 2018-03-28 10:33:51 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-03-28 10:33:51 +0800 |
| commit | bca334e3eac026f143ddf36835d3af8ba3c9a4f1 (patch) | |
| tree | f6465d89914ccc052a87eaa86649068c8a61152a /drivers/regulator | |
| parent | 9a13ce38ebdac3ff3c1c5135978ab7f2cde02632 (diff) | |
| parent | 6a2e3c3ea31bba91191c4c1a8a6afd7f08f9399e (diff) | |
| download | linux-bca334e3eac026f143ddf36835d3af8ba3c9a4f1.tar.gz linux-bca334e3eac026f143ddf36835d3af8ba3c9a4f1.tar.bz2 linux-bca334e3eac026f143ddf36835d3af8ba3c9a4f1.zip | |
Merge remote-tracking branch 'regulator/topic/qcom_smd' into regulator-next
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/qcom_smd-regulator.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/regulator/qcom_smd-regulator.c b/drivers/regulator/qcom_smd-regulator.c index ef51db5f0d9b..fe2fb36803e0 100644 --- a/drivers/regulator/qcom_smd-regulator.c +++ b/drivers/regulator/qcom_smd-regulator.c @@ -17,8 +17,6 @@ #include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/regulator/driver.h> -#include <linux/regulator/machine.h> -#include <linux/regulator/of_regulator.h> #include <linux/soc/qcom/smd-rpm.h> struct qcom_rpm_reg { |