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 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
mfp-pxa2xx.c
diff --git
a/arch/arm/mach-pxa/mfp-pxa2xx.c
b/arch/arm/mach-pxa/mfp-pxa2xx.c
index
1d1419b
..
87ae312
100644
(file)
--- a/
arch/arm/mach-pxa/mfp-pxa2xx.c
+++ b/
arch/arm/mach-pxa/mfp-pxa2xx.c
@@
-16,7
+16,7
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
-#include <linux/sys
dev
.h>
+#include <linux/sys
core_ops
.h>
#include <mach/gpio.h>
#include <mach/pxa2xx-regs.h>
#include <mach/gpio.h>
#include <mach/pxa2xx-regs.h>
@@
-338,7
+338,7
@@
static unsigned long saved_gafr[2][4];
static unsigned long saved_gpdr[4];
static unsigned long saved_pgsr[4];
static unsigned long saved_gpdr[4];
static unsigned long saved_pgsr[4];
-static int pxa2xx_mfp_suspend(
struct sys_device *d, pm_message_t state
)
+static int pxa2xx_mfp_suspend(
void
)
{
int i;
{
int i;
@@
-365,7
+365,7
@@
static int pxa2xx_mfp_suspend(struct sys_device *d, pm_message_t state)
return 0;
}
return 0;
}
-static
int pxa2xx_mfp_resume(struct sys_device *
d)
+static
void pxa2xx_mfp_resume(voi
d)
{
int i;
{
int i;
@@
-376,15
+376,13
@@
static int pxa2xx_mfp_resume(struct sys_device *d)
PGSR(i) = saved_pgsr[i];
}
PSSR = PSSR_RDH | PSSR_PH;
PGSR(i) = saved_pgsr[i];
}
PSSR = PSSR_RDH | PSSR_PH;
- return 0;
}
#else
#define pxa2xx_mfp_suspend NULL
#define pxa2xx_mfp_resume NULL
#endif
}
#else
#define pxa2xx_mfp_suspend NULL
#define pxa2xx_mfp_resume NULL
#endif
-struct sysdev_class pxa2xx_mfp_sysclass = {
- .name = "mfp",
+struct syscore_ops pxa2xx_mfp_syscore_ops = {
.suspend = pxa2xx_mfp_suspend,
.resume = pxa2xx_mfp_resume,
};
.suspend = pxa2xx_mfp_suspend,
.resume = pxa2xx_mfp_resume,
};
@@
-409,6
+407,6
@@
static int __init pxa2xx_mfp_init(void)
for (i = 0; i <= gpio_to_bank(pxa_last_gpio); i++)
gpdr_lpm[i] = GPDR(i * 32);
for (i = 0; i <= gpio_to_bank(pxa_last_gpio); i++)
gpdr_lpm[i] = GPDR(i * 32);
- return
sysdev_class_register(&pxa2xx_mfp_sysclass)
;
+ return
0
;
}
postcore_initcall(pxa2xx_mfp_init);
}
postcore_initcall(pxa2xx_mfp_init);