projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
mach-s3c24xx
/
pm-s3c2410.c
diff --git
a/arch/arm/mach-s3c24xx/pm-s3c2410.c
b/arch/arm/mach-s3c24xx/pm-s3c2410.c
index
fda5385
..
03f706d
100644
(file)
--- a/
arch/arm/mach-s3c24xx/pm-s3c2410.c
+++ b/
arch/arm/mach-s3c24xx/pm-s3c2410.c
@@
-111,7
+111,7
@@
struct syscore_ops s3c2410_pm_syscore_ops = {
.resume = s3c2410_pm_resume,
};
-static int s3c2410_pm_add(struct device *dev)
+static int s3c2410_pm_add(struct device *dev
, struct subsys_interface *sif
)
{
pm_cpu_prep = s3c2410_pm_prepare;
pm_cpu_sleep = s3c2410_cpu_suspend;