diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-22 04:34:08 +0200 |
| commit | a3536c839f04682ed06c84a7f75968c27c6108c8 (patch) | |
| tree | 92c26ea74c0ffb9b83a2285ad2539cc271b09856 /arch/ppc/syslib/open_pic2.c | |
| parent | [PATCH] Updated ipw2200 to compile with ieee80211 abg_ture to abg_true change (diff) | |
| parent | [PATCH] uml: fix compile warning after consolidation patch (diff) | |
| download | linux-a3536c839f04682ed06c84a7f75968c27c6108c8.tar.xz linux-a3536c839f04682ed06c84a7f75968c27c6108c8.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc/syslib/open_pic2.c')
| -rw-r--r-- | arch/ppc/syslib/open_pic2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c index 2e0ea92144f6..9a7e8748e2b2 100644 --- a/arch/ppc/syslib/open_pic2.c +++ b/arch/ppc/syslib/open_pic2.c @@ -575,7 +575,7 @@ static void openpic2_cached_disable_irq(u_int irq) * we need something better to deal with that... Maybe switch to S1 for * cpufreq changes */ -int openpic2_suspend(struct sys_device *sysdev, u32 state) +int openpic2_suspend(struct sys_device *sysdev, pm_message_t state) { int i; unsigned long flags; |