git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-s3c2440
/
mach-osiris.c
diff --git
a/arch/arm/mach-s3c2440/mach-osiris.c
b/arch/arm/mach-s3c2440/mach-osiris.c
index
c326983
..
78af766
100644
(file)
--- a/
arch/arm/mach-s3c2440/mach-osiris.c
+++ b/
arch/arm/mach-s3c2440/mach-osiris.c
@@
-312,7
+312,7
@@
static int osiris_pm_resume(struct sys_device *sd)
#endif
static struct sysdev_class osiris_pm_sysclass = {
#endif
static struct sysdev_class osiris_pm_sysclass = {
-
set_kset_name("mach-osiris")
,
+
.name = "mach-osiris"
,
.suspend = osiris_pm_suspend,
.resume = osiris_pm_resume,
};
.suspend = osiris_pm_suspend,
.resume = osiris_pm_resume,
};