aboutsummaryrefslogtreecommitdiff
path: root/arch/sh
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 15:25:37 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:37 -0700
commit3bfffd97ef913045080861d1898286ac8975c22a (patch)
tree482accb34d082f7460c8acc8db6e00331dbf3e29 /arch/sh
parent9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 (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 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/cpu/bus.c b/arch/sh/kernel/cpu/bus.c
index ace82f4b4a5..d4fee2a7937 100644
--- a/arch/sh/kernel/cpu/bus.c
+++ b/arch/sh/kernel/cpu/bus.c
@@ -31,7 +31,7 @@ static int sh_bus_match(struct device *dev, struct device_driver *drv)
return shdev->dev_id == shdrv->dev_id;
}
-static int sh_bus_suspend(struct device *dev, u32 state)
+static int sh_bus_suspend(struct device *dev, pm_message_t state)
{
struct sh_dev *shdev = to_sh_dev(dev);
struct sh_driver *shdrv = to_sh_driver(dev->driver);