diff options
| author | Sebastian Reichel <sre@kernel.org> | 2017-06-08 18:21:25 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2017-06-08 18:21:25 +0200 |
| commit | 153e9e90ff89a2ec04276968b6769de7b00d86f6 (patch) | |
| tree | c7935ec252bebdcd65bafb759c18911a5ae9b056 | |
| parent | power: supply: axp20x_battery: add DT support for battery max constant charge... (diff) | |
| parent | power: reset: reboot-mode: Make include file global (diff) | |
| download | linux-153e9e90ff89a2ec04276968b6769de7b00d86f6.tar.xz linux-153e9e90ff89a2ec04276968b6769de7b00d86f6.zip | |
Merge branch 'psy-reboot-mode-immutable' into psy-next
| -rw-r--r-- | drivers/power/reset/reboot-mode.c | 2 | ||||
| -rw-r--r-- | drivers/power/reset/syscon-reboot-mode.c | 2 | ||||
| -rw-r--r-- | include/linux/reboot-mode.h (renamed from drivers/power/reset/reboot-mode.h) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c index fb512183ace3..8f975ca0a8c4 100644 --- a/drivers/power/reset/reboot-mode.c +++ b/drivers/power/reset/reboot-mode.c @@ -13,7 +13,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/reboot.h> -#include "reboot-mode.h" +#include <linux/reboot-mode.h> #define PREFIX "mode-" diff --git a/drivers/power/reset/syscon-reboot-mode.c b/drivers/power/reset/syscon-reboot-mode.c index c8c371b285b1..563a97d7f73e 100644 --- a/drivers/power/reset/syscon-reboot-mode.c +++ b/drivers/power/reset/syscon-reboot-mode.c @@ -15,7 +15,7 @@ #include <linux/reboot.h> #include <linux/regmap.h> #include <linux/mfd/syscon.h> -#include "reboot-mode.h" +#include <linux/reboot-mode.h> struct syscon_reboot_mode { struct regmap *map; diff --git a/drivers/power/reset/reboot-mode.h b/include/linux/reboot-mode.h index 75f7fe5c881f..75f7fe5c881f 100644 --- a/drivers/power/reset/reboot-mode.h +++ b/include/linux/reboot-mode.h |