diff options
author | Pavel Machek <pavel@suse.cz> | 2005-04-16 18:25:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:31 -0400 |
commit | 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb (patch) | |
tree | fab311f6e4cfa969630e008ce63e45554a96df07 /arch/x86_64/kernel/i8259.c | |
parent | e2d53566a757c8d12246d8daf8c5a2f21a0c4293 (diff) |
[PATCH] Fix u32 vs. pm_message_t in x86-64
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately that
turned out not to be the case... Here are fixes x86-64.
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/x86_64/kernel/i8259.c')
-rw-r--r-- | arch/x86_64/kernel/i8259.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c index d52701246010..7873d9ba8814 100644 --- a/arch/x86_64/kernel/i8259.c +++ b/arch/x86_64/kernel/i8259.c | |||
@@ -409,7 +409,7 @@ static int i8259A_resume(struct sys_device *dev) | |||
409 | return 0; | 409 | return 0; |
410 | } | 410 | } |
411 | 411 | ||
412 | static int i8259A_suspend(struct sys_device *dev, u32 state) | 412 | static int i8259A_suspend(struct sys_device *dev, pm_message_t state) |
413 | { | 413 | { |
414 | save_ELCR(irq_trigger); | 414 | save_ELCR(irq_trigger); |
415 | return 0; | 415 | return 0; |