summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-17 00:25:34 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 00:25:34 +0200
commitb1c42851b006398dda77a068275e8741e33761f1 (patch)
tree4ef18893a0f5618484a721a3851eeeb68a222eba /arch
parent[PATCH] fix u32 vs. pm_message_t in PCI, PCIE (diff)
downloadlinux-b1c42851b006398dda77a068275e8741e33761f1.tar.xz
linux-b1c42851b006398dda77a068275e8741e33761f1.zip
[PATCH] u32 vs. pm_message_t in ppc and radeon
This fixes pm_message_t vs. u32 confusion in ppc and aty (I *hope* that's basically radeon code...). I was not able to test most of these, but I'm not really changing anything, so it should be okay. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ppc64/kernel/of_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/of_device.c b/arch/ppc64/kernel/of_device.c
index b27a75f1b986..f4c825a69fa0 100644
--- a/arch/ppc64/kernel/of_device.c
+++ b/arch/ppc64/kernel/of_device.c
@@ -104,7 +104,7 @@ static int of_device_remove(struct device *dev)
return 0;
}
-static int of_device_suspend(struct device *dev, u32 state)
+static int of_device_suspend(struct device *dev, pm_message_t state)
{
struct of_device * of_dev = to_of_device(dev);
struct of_platform_driver * drv = to_of_platform_driver(dev->driver);