git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vserver 2.0 rc7
[linux-2.6.git]
/
arch
/
arm
/
mach-integrator
/
integrator_ap.c
diff --git
a/arch/arm/mach-integrator/integrator_ap.c
b/arch/arm/mach-integrator/integrator_ap.c
index
219ae50
..
91ba9fd
100644
(file)
--- a/
arch/arm/mach-integrator/integrator_ap.c
+++ b/
arch/arm/mach-integrator/integrator_ap.c
@@
-137,7
+137,7
@@
static void __init ap_init_irq(void)
#ifdef CONFIG_PM
static unsigned long ic_irq_enable;
-static int irq_suspend(struct sys_device *dev,
u32
state)
+static int irq_suspend(struct sys_device *dev,
pm_message_t
state)
{
ic_irq_enable = readl(VA_IC_BASE + IRQ_ENABLE);
return 0;