diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 15:48:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 15:48:33 -0700 |
| commit | 514fd7fd01d378a7b5584c657d9807fc28f22079 (patch) | |
| tree | bda3910b7737a4fac464792657ffedcba185d799 /include/asm-ia64/sn/pcibr_provider.h | |
| parent | 1e279dd855d15b72364b4103f872d67d8592647e (diff) | |
| parent | 99ad25a313bda566a346b46a6015afa65bc0a02b (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/sn/pcibr_provider.h')
| -rw-r--r-- | include/asm-ia64/sn/pcibr_provider.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/pcibr_provider.h b/include/asm-ia64/sn/pcibr_provider.h index f9b8d216400..2b42d9ece26 100644 --- a/include/asm-ia64/sn/pcibr_provider.h +++ b/include/asm-ia64/sn/pcibr_provider.h @@ -128,7 +128,7 @@ pcibr_lock(struct pcibus_info *pcibus_info) #define pcibr_unlock(pcibus_info, flag) spin_unlock_irqrestore(&pcibus_info->pbi_lock, flag) extern int pcibr_init_provider(void); -extern void *pcibr_bus_fixup(struct pcibus_bussoft *); +extern void *pcibr_bus_fixup(struct pcibus_bussoft *, struct pci_controller *); extern dma_addr_t pcibr_dma_map(struct pci_dev *, unsigned long, size_t); extern dma_addr_t pcibr_dma_map_consistent(struct pci_dev *, unsigned long, size_t); extern void pcibr_dma_unmap(struct pci_dev *, dma_addr_t, int); |