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 git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop13xx
/
msi.c
diff --git
a/arch/arm/mach-iop13xx/msi.c
b/arch/arm/mach-iop13xx/msi.c
index
f34b0ed
..
7149fcc
100644
(file)
--- a/
arch/arm/mach-iop13xx/msi.c
+++ b/
arch/arm/mach-iop13xx/msi.c
@@
-164,10
+164,10
@@
static void iop13xx_msi_nop(unsigned int irq)
static struct irq_chip iop13xx_msi_chip = {
.name = "PCI-MSI",
.ack = iop13xx_msi_nop,
static struct irq_chip iop13xx_msi_chip = {
.name = "PCI-MSI",
.ack = iop13xx_msi_nop,
- .enable = unmask_msi_irq,
- .disable = mask_msi_irq,
- .mask = mask_msi_irq,
- .unmask = unmask_msi_irq,
+ .
irq_
enable = unmask_msi_irq,
+ .
irq_
disable = mask_msi_irq,
+ .
irq_
mask = mask_msi_irq,
+ .
irq_
unmask = unmask_msi_irq,
};
int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
};
int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)