diff options
author | Brian Norris <computersforpeace@gmail.com> | 2015-05-18 10:50:43 -0700 |
---|---|---|
committer | Brian Norris <computersforpeace@gmail.com> | 2015-05-18 10:50:43 -0700 |
commit | 2ddd8db90a22fc4ac708cd8497ed5e46b7f24d49 (patch) | |
tree | 10924a4ec59c9b2d114c2287bd35e6debc72595f /arch/arm/mach-gemini/common.h | |
parent | 02787daadbdad80c9c79487b5ef8284aff734a7b (diff) | |
parent | e26081808edadfd257c6c9d81014e3b25e9a6118 (diff) |
Merge tag 'v4.1-rc4' into MTD's -next
Diffstat (limited to 'arch/arm/mach-gemini/common.h')
-rw-r--r-- | arch/arm/mach-gemini/common.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-gemini/common.h b/arch/arm/mach-gemini/common.h index 38a45260a7c8..dd883698ff7e 100644 --- a/arch/arm/mach-gemini/common.h +++ b/arch/arm/mach-gemini/common.h @@ -12,6 +12,8 @@ #ifndef __GEMINI_COMMON_H__ #define __GEMINI_COMMON_H__ +#include <linux/reboot.h> + struct mtd_partition; extern void gemini_map_io(void); @@ -26,6 +28,6 @@ extern int platform_register_pflash(unsigned int size, struct mtd_partition *parts, unsigned int nr_parts); -extern void gemini_restart(char mode, const char *cmd); +extern void gemini_restart(enum reboot_mode mode, const char *cmd); #endif /* __GEMINI_COMMON_H__ */ |