projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ceph-for-4.9-rc1' of git://github.com/ceph/ceph-client
[cascardo/linux.git]
/
arch
/
arm
/
mach-s3c24xx
/
pm-s3c2416.c
diff --git
a/arch/arm/mach-s3c24xx/pm-s3c2416.c
b/arch/arm/mach-s3c24xx/pm-s3c2416.c
index
4492389
..
c0e328e
100644
(file)
--- a/
arch/arm/mach-s3c24xx/pm-s3c2416.c
+++ b/
arch/arm/mach-s3c24xx/pm-s3c2416.c
@@
-23,6
+23,7
@@
#include "s3c2412-power.h"
+#ifdef CONFIG_PM_SLEEP
extern void s3c2412_sleep_enter(void);
static int s3c2416_cpu_suspend(unsigned long arg)
@@
-70,7
+71,7
@@
static __init int s3c2416_pm_init(void)
}
arch_initcall(s3c2416_pm_init);
-
+#endif
static void s3c2416_pm_resume(void)
{