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-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
irq.c
diff --git
a/arch/arm/mach-sa1100/irq.c
b/arch/arm/mach-sa1100/irq.c
index
423ddb3
..
dfbf824
100644
(file)
--- a/
arch/arm/mach-sa1100/irq.c
+++ b/
arch/arm/mach-sa1100/irq.c
@@
-14,7
+14,7
@@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/ioport.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/ioport.h>
-#include <linux/sys
dev
.h>
+#include <linux/sys
core_ops
.h>
#include <mach/hardware.h>
#include <asm/mach/irq.h>
#include <mach/hardware.h>
#include <asm/mach/irq.h>
@@
-234,7
+234,7
@@
static struct sa1100irq_state {
unsigned int iccr;
} sa1100irq_state;
unsigned int iccr;
} sa1100irq_state;
-static int sa1100irq_suspend(
struct sys_device *dev, pm_message_t state
)
+static int sa1100irq_suspend(
void
)
{
struct sa1100irq_state *st = &sa1100irq_state;
{
struct sa1100irq_state *st = &sa1100irq_state;
@@
-264,7
+264,7
@@
static int sa1100irq_suspend(struct sys_device *dev, pm_message_t state)
return 0;
}
return 0;
}
-static
int sa1100irq_resume(struct sys_device *dev
)
+static
void sa1100irq_resume(void
)
{
struct sa1100irq_state *st = &sa1100irq_state;
{
struct sa1100irq_state *st = &sa1100irq_state;
@@
-277,24
+277,17
@@
static int sa1100irq_resume(struct sys_device *dev)
ICMR = st->icmr;
}
ICMR = st->icmr;
}
- return 0;
}
}
-static struct sysdev_class sa1100irq_sysclass = {
- .name = "sa11x0-irq",
+static struct syscore_ops sa1100irq_syscore_ops = {
.suspend = sa1100irq_suspend,
.resume = sa1100irq_resume,
};
.suspend = sa1100irq_suspend,
.resume = sa1100irq_resume,
};
-static struct sys_device sa1100irq_device = {
- .id = 0,
- .cls = &sa1100irq_sysclass,
-};
-
static int __init sa1100irq_init_devicefs(void)
{
static int __init sa1100irq_init_devicefs(void)
{
-
sysdev_class_register(&sa1100irq_sysclas
s);
- return
sysdev_register(&sa1100irq_device)
;
+
register_syscore_ops(&sa1100irq_syscore_op
s);
+ return
0
;
}
device_initcall(sa1100irq_init_devicefs);
}
device_initcall(sa1100irq_init_devicefs);