diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:28:39 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-12 21:28:39 -0600 |
| commit | 67c2b7d9d224232ee730b9c9444abed824b62e7a (patch) | |
| tree | 61a48c2e3562f8f66c04fd02691390dec96466e1 /include/linux/msi.h | |
| parent | 49baa91d6863df480fa05eb57524a274f77fa886 (diff) | |
| parent | 5986a2ec35836a878350c54af4bd91b1de6abc59 (diff) | |
| download | blackbird-op-linux-67c2b7d9d224232ee730b9c9444abed824b62e7a.tar.gz blackbird-op-linux-67c2b7d9d224232ee730b9c9444abed824b62e7a.zip | |
Merge branch 'master' into 83xx
Diffstat (limited to 'include/linux/msi.h')
| -rw-r--r-- | include/linux/msi.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/msi.h b/include/linux/msi.h index c7ef94343673..74c8a2ecc9dd 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -7,11 +7,10 @@ struct msi_msg { u32 data; /* 16 bits of msi message data */ }; -/* Heper functions */ +/* Helper functions */ extern void mask_msi_irq(unsigned int irq); extern void unmask_msi_irq(unsigned int irq); extern void read_msi_msg(unsigned int irq, struct msi_msg *msg); - extern void write_msi_msg(unsigned int irq, struct msi_msg *msg); struct msi_desc { @@ -42,7 +41,7 @@ struct msi_desc { /* * The arch hook for setup up msi irqs */ -int arch_setup_msi_irq(unsigned int irq, struct pci_dev *dev); +int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc); void arch_teardown_msi_irq(unsigned int irq); |
