Merge master.kernel.org:/home/rmk/linux-2.6-serial

[karo-tx-linux.git] / arch / ppc / syslib / of_device.c

diff --git a/arch/ppc/syslib/of_device.c b/arch/ppc/syslib/of_device.c
index 1eb4f726ca9ffb09567d77489d9e5bf341f29357..da8a0f2128dccc23bc06cc8b3f8a93809384e7ec 100644 (file)
--- a/arch/ppc/syslib/of_device.c
+++ b/arch/ppc/syslib/of_device.c
@@ -105,7 +105,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);