diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:41:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-04 06:41:37 -0400 |
| commit | f9bcda7760e1373615c9f6d9ce24209b0ab97de1 (patch) | |
| tree | f90b3031126c4e4beb8161f38ea436303e2b8b73 /arch/powerpc/platforms/powermac/pfunc_base.c | |
| parent | 9bec2e38527a9f2497b3d976715c672d08d6160d (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/powerpc/platforms/powermac/pfunc_base.c')
| -rw-r--r-- | arch/powerpc/platforms/powermac/pfunc_base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c b/arch/powerpc/platforms/powermac/pfunc_base.c index 6d66359ec8c8..aacfa59595d1 100644 --- a/arch/powerpc/platforms/powermac/pfunc_base.c +++ b/arch/powerpc/platforms/powermac/pfunc_base.c | |||
| @@ -256,7 +256,7 @@ static struct pmf_handlers macio_mmio_handlers = { | |||
| 256 | .write_reg32 = macio_do_write_reg32, | 256 | .write_reg32 = macio_do_write_reg32, |
| 257 | .read_reg32 = macio_do_read_reg32, | 257 | .read_reg32 = macio_do_read_reg32, |
| 258 | .write_reg8 = macio_do_write_reg8, | 258 | .write_reg8 = macio_do_write_reg8, |
| 259 | .read_reg32 = macio_do_read_reg8, | 259 | .read_reg8 = macio_do_read_reg8, |
| 260 | .read_reg32_msrx = macio_do_read_reg32_msrx, | 260 | .read_reg32_msrx = macio_do_read_reg32_msrx, |
| 261 | .read_reg8_msrx = macio_do_read_reg8_msrx, | 261 | .read_reg8_msrx = macio_do_read_reg8_msrx, |
| 262 | .write_reg32_slm = macio_do_write_reg32_slm, | 262 | .write_reg32_slm = macio_do_write_reg32_slm, |