diff options
| author | Pavel Machek | 2005-04-17 00:25:31 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-04-17 00:25:31 +0200 |
| commit | 0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb (patch) | |
| tree | fab311f6e4cfa969630e008ce63e45554a96df07 /arch/x86_64/kernel/time.c | |
| parent | [PATCH] fix pm_message_t vs. u32 in alsa (diff) | |
| download | kernel-qcow2-linux-0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb.tar.gz kernel-qcow2-linux-0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb.tar.xz kernel-qcow2-linux-0b9c33a7d6b9f1a72b2dc63bb6b8f055203d9bcb.zip | |
[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/time.c')
| -rw-r--r-- | arch/x86_64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 943a9bfba209..0e3b60e1ac5b 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -965,7 +965,7 @@ __setup("report_lost_ticks", time_setup); static long clock_cmos_diff; static unsigned long sleep_start; -static int timer_suspend(struct sys_device *dev, u32 state) +static int timer_suspend(struct sys_device *dev, pm_message_t state) { /* * Estimate time zone so that set_time can update the clock |