diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
| commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
| tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /include/asm-xtensa/pci.h | |
| parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-xtensa/pci.h')
| -rw-r--r-- | include/asm-xtensa/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-xtensa/pci.h b/include/asm-xtensa/pci.h index 6817742301c2..24eb7fc25da8 100644 --- a/include/asm-xtensa/pci.h +++ b/include/asm-xtensa/pci.h | |||
| @@ -22,12 +22,12 @@ | |||
| 22 | 22 | ||
| 23 | extern struct pci_controller* pcibios_alloc_controller(void); | 23 | extern struct pci_controller* pcibios_alloc_controller(void); |
| 24 | 24 | ||
| 25 | extern inline void pcibios_set_master(struct pci_dev *dev) | 25 | static inline void pcibios_set_master(struct pci_dev *dev) |
| 26 | { | 26 | { |
| 27 | /* No special bus mastering setup handling */ | 27 | /* No special bus mastering setup handling */ |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | extern inline void pcibios_penalize_isa_irq(int irq) | 30 | static inline void pcibios_penalize_isa_irq(int irq) |
| 31 | { | 31 | { |
| 32 | /* We don't do dynamic PCI IRQ allocation */ | 32 | /* We don't do dynamic PCI IRQ allocation */ |
| 33 | } | 33 | } |