projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
[powerpc.git]
/
arch
/
ppc
/
syslib
/
ocp.c
diff --git
a/arch/ppc/syslib/ocp.c
b/arch/ppc/syslib/ocp.c
index
e5fd2ae
..
9ccce43
100644
(file)
--- a/
arch/ppc/syslib/ocp.c
+++ b/
arch/ppc/syslib/ocp.c
@@
-165,7
+165,7
@@
ocp_device_remove(struct device *dev)
}
static int
-ocp_device_suspend(struct device *dev,
u32
state)
+ocp_device_suspend(struct device *dev,
pm_message_t
state)
{
struct ocp_device *ocp_dev = to_ocp_dev(dev);
struct ocp_driver *ocp_drv = to_ocp_drv(dev->driver);