summaryrefslogtreecommitdiffstats
path: root/arch/ppc/syslib/of_device.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-09-08 01:45:47 -0400
committerLen Brown <len.brown@intel.com>2005-09-08 01:45:47 -0400
commit64e47488c913ac704d465a6af86a26786d1412a5 (patch)
treed3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/ppc/syslib/of_device.c
parent4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff)
parentcaf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff)
downloadblackbird-op-linux-64e47488c913ac704d465a6af86a26786d1412a5.tar.gz
blackbird-op-linux-64e47488c913ac704d465a6af86a26786d1412a5.zip
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/ppc/syslib/of_device.c')
-rw-r--r--arch/ppc/syslib/of_device.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/syslib/of_device.c b/arch/ppc/syslib/of_device.c
index 1eb4f726ca9f..da8a0f2128dc 100644
--- 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);
OpenPOWER on IntegriCloud