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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
[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
9708553
..
e3e379c
100644
(file)
--- a/
arch/powerpc/platforms/cell/axon_msi.c
+++ b/
arch/powerpc/platforms/cell/axon_msi.c
@@
-310,9
+310,9
@@
static void axon_msi_teardown_msi_irqs(struct pci_dev *dev)
}
static struct irq_chip msic_irq_chip = {
- .
mask
= mask_msi_irq,
- .
unmask
= unmask_msi_irq,
- .
shutdown = un
mask_msi_irq,
+ .
irq_mask
= mask_msi_irq,
+ .
irq_unmask
= unmask_msi_irq,
+ .
irq_shutdown =
mask_msi_irq,
.name = "AXON-MSI",
};