diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/sparc/kernel/pci_impl.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/sparc/kernel/pci_impl.h')
| -rw-r--r-- | arch/sparc/kernel/pci_impl.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/pci_impl.h b/arch/sparc/kernel/pci_impl.h index e20ed5f06e9c..6beb60df31d0 100644 --- a/arch/sparc/kernel/pci_impl.h +++ b/arch/sparc/kernel/pci_impl.h | |||
| @@ -131,9 +131,9 @@ struct pci_pbm_info { | |||
| 131 | void *msi_queues; | 131 | void *msi_queues; |
| 132 | unsigned long *msi_bitmap; | 132 | unsigned long *msi_bitmap; |
| 133 | unsigned int *msi_irq_table; | 133 | unsigned int *msi_irq_table; |
| 134 | int (*setup_msi_irq)(unsigned int *virt_irq_p, struct pci_dev *pdev, | 134 | int (*setup_msi_irq)(unsigned int *irq_p, struct pci_dev *pdev, |
| 135 | struct msi_desc *entry); | 135 | struct msi_desc *entry); |
| 136 | void (*teardown_msi_irq)(unsigned int virt_irq, struct pci_dev *pdev); | 136 | void (*teardown_msi_irq)(unsigned int irq, struct pci_dev *pdev); |
| 137 | const struct sparc64_msiq_ops *msi_ops; | 137 | const struct sparc64_msiq_ops *msi_ops; |
| 138 | #endif /* !(CONFIG_PCI_MSI) */ | 138 | #endif /* !(CONFIG_PCI_MSI) */ |
| 139 | 139 | ||