| Message ID | 20170427153012.32310-3-sebastian.reichel@collabora.co.uk (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Hi, On Thu, Apr 27, 2017 at 05:30:07PM +0200, Sebastian Reichel wrote: > Avoid inclusion of unused twl4030-madc.h. This > will allow twl4030-madc.h to be merged into the > iio driver. > > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Queued into power-supply's for-next. I plan to send a second pull-request for power-supply. -- Sebastian
diff --git a/drivers/power/supply/rx51_battery.c b/drivers/power/supply/rx51_battery.c index af9383d23d12..5654708b1279 100644 --- a/drivers/power/supply/rx51_battery.c +++ b/drivers/power/supply/rx51_battery.c @@ -23,7 +23,6 @@ #include <linux/platform_device.h> #include <linux/power_supply.h> #include <linux/slab.h> -#include <linux/i2c/twl4030-madc.h> #include <linux/iio/consumer.h> #include <linux/of.h> diff --git a/drivers/power/supply/twl4030_madc_battery.c b/drivers/power/supply/twl4030_madc_battery.c index f5817e422d64..4d41acb98576 100644 --- a/drivers/power/supply/twl4030_madc_battery.c +++ b/drivers/power/supply/twl4030_madc_battery.c @@ -17,7 +17,6 @@ #include <linux/power_supply.h> #include <linux/slab.h> #include <linux/sort.h> -#include <linux/i2c/twl4030-madc.h> #include <linux/power/twl4030_madc_battery.h> #include <linux/iio/consumer.h>
Avoid inclusion of unused twl4030-madc.h. This will allow twl4030-madc.h to be merged into the iio driver. Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> --- drivers/power/supply/rx51_battery.c | 1 - drivers/power/supply/twl4030_madc_battery.c | 1 - 2 files changed, 2 deletions(-)