Merge branch 'psy-reboot-mode-immutable' into psy-next

2017-06-08 18:21:25 +02:00 · 2017-06-08 18:21:25 +02:00 · 153e9e90ff
commit 153e9e90ff
parent c800384490 f1bea8793d
3 changed files with 2 additions and 2 deletions
--- 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-"

--- 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;
--- a/drivers/power/reset/reboot-mode.h
+++ b/drivers/power/reset/reboot-mode.h