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/teigland/dlm
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
pxa27x.c
diff --git
a/arch/arm/mach-pxa/pxa27x.c
b/arch/arm/mach-pxa/pxa27x.c
index
909756e
..
2fecbec
100644
(file)
--- a/
arch/arm/mach-pxa/pxa27x.c
+++ b/
arch/arm/mach-pxa/pxa27x.c
@@
-16,7
+16,7
@@
#include <linux/init.h>
#include <linux/suspend.h>
#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/suspend.h>
#include <linux/platform_device.h>
-#include <linux/sys
dev
.h>
+#include <linux/sys
core_ops
.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/i2c/pxa-i2c.h>
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/i2c/pxa-i2c.h>
@@
-428,21
+428,9
@@
static struct platform_device *devices[] __initdata = {
&pxa27x_device_pwm1,
};
&pxa27x_device_pwm1,
};
-static struct sys_device pxa27x_sysdev[] = {
- {
- .cls = &pxa_irq_sysclass,
- }, {
- .cls = &pxa2xx_mfp_sysclass,
- }, {
- .cls = &pxa_gpio_sysclass,
- }, {
- .cls = &pxa2xx_clock_sysclass,
- }
-};
-
static int __init pxa27x_init(void)
{
static int __init pxa27x_init(void)
{
- int
i,
ret = 0;
+ int ret = 0;
if (cpu_is_pxa27x()) {
if (cpu_is_pxa27x()) {
@@
-455,11
+443,10
@@
static int __init pxa27x_init(void)
pxa27x_init_pm();
pxa27x_init_pm();
- for (i = 0; i < ARRAY_SIZE(pxa27x_sysdev); i++) {
- ret = sysdev_register(&pxa27x_sysdev[i]);
- if (ret)
- pr_err("failed to register sysdev[%d]\n", i);
- }
+ register_syscore_ops(&pxa_irq_syscore_ops);
+ register_syscore_ops(&pxa2xx_mfp_syscore_ops);
+ register_syscore_ops(&pxa_gpio_syscore_ops);
+ register_syscore_ops(&pxa2xx_clock_syscore_ops);
ret = platform_add_devices(devices, ARRAY_SIZE(devices));
}
ret = platform_add_devices(devices, ARRAY_SIZE(devices));
}