summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/i8259.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@suse.cz>2005-04-16 15:25:31 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:31 -0700
commit0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb (patch)
treefab311f6e4cfa969630e008ce63e45554a96df07 /arch/x86_64/kernel/i8259.c
parente2d53566a757c8d12246d8daf8c5a2f21a0c4293 (diff)
downloadop-kernel-dev-0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb.zip
op-kernel-dev-0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb.tar.gz
[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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index d5270124..7873d9b 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)
return 0;
}
-static int i8259A_suspend(struct sys_device *dev, u32 state)
+static int i8259A_suspend(struct sys_device *dev, pm_message_t state)
{
save_ELCR(irq_trigger);
return 0;
OpenPOWER on IntegriCloud