git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'v2.6.28-rc9' into next
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
cell
/
axon_msi.c
diff --git
a/arch/powerpc/platforms/cell/axon_msi.c
b/arch/powerpc/platforms/cell/axon_msi.c
index
442cf36
..
0ce45c2
100644
(file)
--- 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,
MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE |
MSIC_CTRL_FIFO_SIZE);
+ msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG)
+ & MSIC_FIFO_SIZE_MASK;
+
device->dev.platform_data = msic;
ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs;