diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-17 07:07:48 -0500 |
| commit | 1f3f424a6bee9de4d839be9951f4296333fac014 (patch) | |
| tree | 95de90dfdb4a9f64fe470709b82176243537c952 /arch/powerpc/platforms | |
| parent | c8cae544bba6aee0f5cb0756dbab1a71d2c68737 (diff) | |
| parent | 1bda71282ded6a2e09a2db7c8884542fb46bfd4f (diff) | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/cell/axon_msi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index 442cf36aa172..0ce45c2b42f8 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c | |||
| @@ -413,6 +413,9 @@ static int axon_msi_probe(struct of_device *device, | |||
| 413 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | | 413 | MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE | |
| 414 | MSIC_CTRL_FIFO_SIZE); | 414 | MSIC_CTRL_FIFO_SIZE); |
| 415 | 415 | ||
| 416 | msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG) | ||
| 417 | & MSIC_FIFO_SIZE_MASK; | ||
| 418 | |||
| 416 | device->dev.platform_data = msic; | 419 | device->dev.platform_data = msic; |
| 417 | 420 | ||
| 418 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; | 421 | ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; |