diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
| commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
| tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /arch/ppc/syslib/ocp.c | |
| parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
| parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) | |
| download | kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.zip kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.tar.gz kernel_samsung_tuna-70c07e02625ec46d0ffbfce1acef42d660803528.tar.bz2 | |
Merge branch 'viro'
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 ab34b1d..2fe28de 100644 --- a/arch/ppc/syslib/ocp.c +++ b/arch/ppc/syslib/ocp.c @@ -189,8 +189,8 @@ ocp_device_resume(struct device *dev) struct bus_type ocp_bus_type = { .name = "ocp", .match = ocp_device_match, - .probe = ocp_driver_probe, - .remove = ocp_driver_remove, + .probe = ocp_device_probe, + .remove = ocp_device_remove, .suspend = ocp_device_suspend, .resume = ocp_device_resume, }; |