diff -urN 2.4.19pre2/include/asm-ia64/dma.h ia64/include/asm-ia64/dma.h --- 2.4.19pre2/include/asm-ia64/dma.h Tue May 1 19:35:30 2001 +++ ia64/include/asm-ia64/dma.h Mon Mar 11 05:44:37 2002 @@ -12,6 +12,10 @@ extern unsigned long MAX_DMA_ADDRESS; +/* These are in kernel/dma.c: */ +extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ +extern void free_dma(unsigned int dmanr); /* release it again */ + #ifdef CONFIG_PCI extern int isa_dma_bridge_buggy; #else diff -urN 2.4.19pre2/include/asm-ia64/pci.h ia64/include/asm-ia64/pci.h --- 2.4.19pre2/include/asm-ia64/pci.h Fri Mar 1 00:09:38 2002 +++ ia64/include/asm-ia64/pci.h Mon Mar 11 05:45:04 2002 @@ -54,6 +54,11 @@ #define pci_unmap_len(ptr, len_name) ((ptr)->len_name) #define pci_unmap_len_set(ptr, len_name, val) (((ptr)->len_name) = (val)) +/* The PCI address space does equal the physical memory address space. + The networking and block device layers use this boolean for bounce buffer + decisions. */ +#define PCI_DMA_BUS_IS_PHYS 1 + /* * Return whether the given PCI device DMA address mask can be supported properly. For * example, if your device can only drive the low 24-bits during PCI bus mastering, then diff -urN 2.4.19pre2/include/asm-ia64/types.h ia64/include/asm-ia64/types.h --- 2.4.19pre2/include/asm-ia64/types.h Sat Apr 22 00:21:24 2000 +++ ia64/include/asm-ia64/types.h Mon Mar 11 05:44:37 2002 @@ -63,6 +63,7 @@ /* DMA addresses are 64-bits wide, in general. */ typedef u64 dma_addr_t; +typedef u64 dma64_addr_t; # endif /* __KERNEL__ */ #endif /* !__ASSEMBLY__ */