diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 15:25:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:37 -0700 |
| commit | 3bfffd97ef913045080861d1898286ac8975c22a (patch) | |
| tree | 482accb34d082f7460c8acc8db6e00331dbf3e29 /drivers | |
| parent | 9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 (diff) | |
[PATCH] fix u32 vs. pm_message_t in rest of the tree
This fixes u32 vs. pm_message_t confusion in remaining places. Fortunately
there's few of them.
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 'drivers')
| -rw-r--r-- | drivers/ide/pci/sc1200.c | 2 | ||||
| -rw-r--r-- | drivers/macintosh/via-pmu.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c index 84fda21e4db..3bc3bf1be49 100644 --- a/drivers/ide/pci/sc1200.c +++ b/drivers/ide/pci/sc1200.c @@ -346,7 +346,7 @@ typedef struct sc1200_saved_state_s { } sc1200_saved_state_t; -static int sc1200_suspend (struct pci_dev *dev, u32 state) +static int sc1200_suspend (struct pci_dev *dev, pm_message_t state) { ide_hwif_t *hwif = NULL; diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index cea1e758eb4..aefc0c1a862 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -3052,7 +3052,7 @@ pmu_polled_request(struct adb_request *req) static int pmu_sys_suspended = 0; -static int pmu_sys_suspend(struct sys_device *sysdev, u32 state) +static int pmu_sys_suspend(struct sys_device *sysdev, pm_message_t state) { if (state != PM_SUSPEND_DISK || pmu_sys_suspended) return 0; |