diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /arch/ppc/syslib/ocp.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/ppc/syslib/ocp.c')
| -rw-r--r-- | arch/ppc/syslib/ocp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c index ab34b1d6072f..2fe28ded2c60 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c | |||
| @@ -189,8 +189,8 @@ ocp_device_resume(struct device *dev) | |||
| 189 | struct bus_type ocp_bus_type = { | 189 | struct bus_type ocp_bus_type = { |
| 190 | .name = "ocp", | 190 | .name = "ocp", |
| 191 | .match = ocp_device_match, | 191 | .match = ocp_device_match, |
| 192 | .probe = ocp_driver_probe, | 192 | .probe = ocp_device_probe, |
| 193 | .remove = ocp_driver_remove, | 193 | .remove = ocp_device_remove, |
| 194 | .suspend = ocp_device_suspend, | 194 | .suspend = ocp_device_suspend, |
| 195 | .resume = ocp_device_resume, | 195 | .resume = ocp_device_resume, |
| 196 | }; | 196 | }; |