mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 16:37:50 +00:00
Merge branch 'psy-reboot-mode-immutable' into psy-next
This commit is contained in:
commit
153e9e90ff
3 changed files with 2 additions and 2 deletions
|
@ -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-"
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue