diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:24 -0400 |
| commit | 438510f6f079e94df294936b5bd8a7fd679cd1c9 (patch) | |
| tree | 9c26a3eb527e95ed19e74d2c1d58e46f2d6908df /arch/i386/oprofile/nmi_int.c | |
| parent | 74ad74c1581c9a27582945ca01ffdb88fc774171 (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/oprofile/nmi_int.c')
| -rw-r--r-- | arch/i386/oprofile/nmi_int.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c index 3492d961d3f1..255e4702d185 100644 --- a/arch/i386/oprofile/nmi_int.c +++ b/arch/i386/oprofile/nmi_int.c | |||
| @@ -32,7 +32,7 @@ static int nmi_enabled = 0; | |||
| 32 | 32 | ||
| 33 | #ifdef CONFIG_PM | 33 | #ifdef CONFIG_PM |
| 34 | 34 | ||
| 35 | static int nmi_suspend(struct sys_device *dev, u32 state) | 35 | static int nmi_suspend(struct sys_device *dev, pm_message_t state) |
| 36 | { | 36 | { |
| 37 | if (nmi_enabled == 1) | 37 | if (nmi_enabled == 1) |
| 38 | nmi_stop(); | 38 | nmi_stop(); |