diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/sparc/kernel/pci_msi.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/sparc/kernel/pci_msi.c')
| -rw-r--r-- | arch/sparc/kernel/pci_msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pci_msi.c b/arch/sparc/kernel/pci_msi.c index f1be37a7b12..e1b0541feb1 100644 --- 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) | |||
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | static struct irq_chip msi_irq = { | 114 | static struct irq_chip msi_irq = { |
| 115 | .typename = "PCI-MSI", | 115 | .name = "PCI-MSI", |
| 116 | .mask = mask_msi_irq, | 116 | .mask = mask_msi_irq, |
| 117 | .unmask = unmask_msi_irq, | 117 | .unmask = unmask_msi_irq, |
| 118 | .enable = unmask_msi_irq, | 118 | .enable = unmask_msi_irq, |