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.open-osd.org/linux-open-osd
[pandora-kernel.git]
/
arch
/
ia64
/
sn
/
kernel
/
msi_sn.c
diff --git
a/arch/ia64/sn/kernel/msi_sn.c
b/arch/ia64/sn/kernel/msi_sn.c
index
0c72dd4
..
a5e500f
100644
(file)
--- a/
arch/ia64/sn/kernel/msi_sn.c
+++ b/
arch/ia64/sn/kernel/msi_sn.c
@@
-228,8
+228,8
@@
static int sn_msi_retrigger_irq(unsigned int irq)
static struct irq_chip sn_msi_chip = {
.name = "PCI-MSI",
static struct irq_chip sn_msi_chip = {
.name = "PCI-MSI",
- .
mask
= mask_msi_irq,
- .
unmask
= unmask_msi_irq,
+ .
irq_mask
= mask_msi_irq,
+ .
irq_unmask
= unmask_msi_irq,
.ack = sn_ack_msi_irq,
#ifdef CONFIG_SMP
.set_affinity = sn_set_msi_irq_affinity,
.ack = sn_ack_msi_irq,
#ifdef CONFIG_SMP
.set_affinity = sn_set_msi_irq_affinity,