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 /drivers/power | |
| parent | power: supply: axp20x_battery: add DT support for battery max constant charge current (diff) | |
| parent | power: reset: reboot-mode: Make include file global (diff) | |
| download | linux-dev-153e9e90ff89a2ec04276968b6769de7b00d86f6.tar.xz linux-dev-153e9e90ff89a2ec04276968b6769de7b00d86f6.zip | |
Merge branch 'psy-reboot-mode-immutable' into psy-next
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/reset/reboot-mode.c | 2 | ||||
| -rw-r--r-- | drivers/power/reset/reboot-mode.h | 18 | ||||
| -rw-r--r-- | drivers/power/reset/syscon-reboot-mode.c | 2 |
3 files changed, 2 insertions, 20 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/reboot-mode.h b/drivers/power/reset/reboot-mode.h deleted file mode 100644 index 75f7fe5c881f..000000000000 --- a/drivers/power/reset/reboot-mode.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __REBOOT_MODE_H__ -#define __REBOOT_MODE_H__ - -struct reboot_mode_driver { - struct device *dev; - struct list_head head; - int (*write)(struct reboot_mode_driver *reboot, unsigned int magic); - struct notifier_block reboot_notifier; -}; - -int reboot_mode_register(struct reboot_mode_driver *reboot); -int reboot_mode_unregister(struct reboot_mode_driver *reboot); -int devm_reboot_mode_register(struct device *dev, - struct reboot_mode_driver *reboot); -void devm_reboot_mode_unregister(struct device *dev, - struct reboot_mode_driver *reboot); - -#endif 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; |