git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.15-rc1' into perf/urgent
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-s3c64xx
/
include
/
mach
/
pm-core.h
diff --git
a/arch/arm/mach-s3c64xx/include/mach/pm-core.h
b/arch/arm/mach-s3c64xx/include/mach/pm-core.h
index c0537f40a3d859205fb7609ad912fa8ecf64c053..a30a1e3ffc6a3cb1240e9b6140e534c54226a852 100644
(file)
--- a/
arch/arm/mach-s3c64xx/include/mach/pm-core.h
+++ b/
arch/arm/mach-s3c64xx/include/mach/pm-core.h
@@
-15,6
+15,8
@@
#ifndef __MACH_S3C64XX_PM_CORE_H
#define __MACH_S3C64XX_PM_CORE_H __FILE__
+#include <linux/serial_s3c.h>
+
#include <mach/regs-gpio.h>
static inline void s3c_pm_debug_init_uart(void)