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

bca334e3 · Mark Brown · 9a13ce38 · 6a2e3c3e · bca334e3
Commit bca334e3 authored Mar 28, 2018 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

drivers/regulator/qcom_smd-regulator.c drivers/regulator/qcom_smd-regulator.c +0 -2

No files found.
--- 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 {