aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/apic.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:24 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:24 -0400
commit438510f6f079e94df294936b5bd8a7fd679cd1c9 (patch)
tree9c26a3eb527e95ed19e74d2c1d58e46f2d6908df /arch/i386/kernel/apic.c
parent74ad74c1581c9a27582945ca01ffdb88fc774171 (diff)
[PATCH] pm_message_t: more fixes in common and i386
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately that turned out not to be the case as Russel King pointed out. Here are fixes for Documentation and common code (mainly system devices). Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/apic.c')
-rw-r--r--arch/i386/kernel/apic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 35c1751ea0b0..e3879f7625c2 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -548,7 +548,7 @@ static struct {
548 unsigned int apic_thmr; 548 unsigned int apic_thmr;
549} apic_pm_state; 549} apic_pm_state;
550 550
551static int lapic_suspend(struct sys_device *dev, u32 state) 551static int lapic_suspend(struct sys_device *dev, pm_message_t state)
552{ 552{
553 unsigned long flags; 553 unsigned long flags;
554 554