git.samba.org
/
sfrench
/
cifs-2.6.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/tytso/ext4
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
kernel
/
pci_msi.c
diff --git
a/arch/sparc/kernel/pci_msi.c
b/arch/sparc/kernel/pci_msi.c
index f1be37a7b1239975492c1838fb1ec323a89946da..e1b0541feb19d07475a732c152c1f8c35b873a23 100644
(file)
--- a/
arch/sparc/kernel/pci_msi.c
+++ b/
arch/sparc/kernel/pci_msi.c
@@
-112,7
+112,7
@@
static void free_msi(struct pci_pbm_info *pbm, int msi_num)
}
static struct irq_chip msi_irq = {
- .
typename
= "PCI-MSI",
+ .
name
= "PCI-MSI",
.mask = mask_msi_irq,
.unmask = unmask_msi_irq,
.enable = unmask_msi_irq,