diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2021-04-05 12:38:08 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2021-04-05 12:38:08 +0200 |
| commit | 2509555070acb863920b3c89bb678e1a2c7d0c00 (patch) | |
| tree | 45a7143a657a0855f142fdab939744a5fe470b37 /drivers/power/supply/pm2301_charger.c | |
| parent | 25faa935f9e0bd5aba34a820defb982d43bb4a77 (diff) | |
| parent | ee0975c3089e1c3357ccc3ada7a94a95b61e708c (diff) | |
| download | lwn-2509555070acb863920b3c89bb678e1a2c7d0c00.tar.gz lwn-2509555070acb863920b3c89bb678e1a2c7d0c00.zip | |
Merge tag 'ib-mfd-power-v5.13' into psy-next
Immutable branch between MFD and Power due for the v5.13 merge window.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply/pm2301_charger.c')
| -rw-r--r-- | drivers/power/supply/pm2301_charger.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/supply/pm2301_charger.c b/drivers/power/supply/pm2301_charger.c index a3bfb9612b17..f86bbbeaff6c 100644 --- a/drivers/power/supply/pm2301_charger.c +++ b/drivers/power/supply/pm2301_charger.c @@ -18,13 +18,13 @@ #include <linux/i2c.h> #include <linux/workqueue.h> #include <linux/mfd/abx500/ab8500.h> -#include <linux/mfd/abx500/ab8500-bm.h> -#include <linux/mfd/abx500/ux500_chargalg.h> #include <linux/pm2301_charger.h> #include <linux/gpio.h> #include <linux/pm_runtime.h> #include <linux/pm.h> +#include "ab8500-bm.h" +#include "ab8500-chargalg.h" #include "pm2301_charger.h" #define to_pm2xxx_charger_ac_device_info(x) container_of((x), \ |