diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2006-04-28 20:42:26 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-04-28 20:42:26 -0400 |
| commit | d6754b401a15eaa16492ea5dbaa4826361d3f411 (patch) | |
| tree | 032f067d3af458527d903a7653885404ed82431e /include/asm-ia64/machvec.h | |
| parent | acc429a517bd11fdcac9bea97d082d26231beb92 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-ia64/machvec.h')
| -rw-r--r-- | include/asm-ia64/machvec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ia64/machvec.h b/include/asm-ia64/machvec.h index 96d46dbfde47..0df72a134c8b 100644 --- a/include/asm-ia64/machvec.h +++ b/include/asm-ia64/machvec.h | |||
| @@ -346,9 +346,11 @@ extern ia64_mv_dma_supported swiotlb_dma_supported; | |||
| 346 | #endif | 346 | #endif |
| 347 | #ifndef platform_pci_legacy_read | 347 | #ifndef platform_pci_legacy_read |
| 348 | # define platform_pci_legacy_read ia64_pci_legacy_read | 348 | # define platform_pci_legacy_read ia64_pci_legacy_read |
| 349 | extern int ia64_pci_legacy_read(struct pci_bus *bus, u16 port, u32 *val, u8 size); | ||
| 349 | #endif | 350 | #endif |
| 350 | #ifndef platform_pci_legacy_write | 351 | #ifndef platform_pci_legacy_write |
| 351 | # define platform_pci_legacy_write ia64_pci_legacy_write | 352 | # define platform_pci_legacy_write ia64_pci_legacy_write |
| 353 | extern int ia64_pci_legacy_write(struct pci_bus *bus, u16 port, u32 val, u8 size); | ||
| 352 | #endif | 354 | #endif |
| 353 | #ifndef platform_inb | 355 | #ifndef platform_inb |
| 354 | # define platform_inb __ia64_inb | 356 | # define platform_inb __ia64_inb |