diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-10 18:23:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:41 -0500 |
commit | 66ed5ef8b44374def8461a0a05d4afc34d4ad684 (patch) | |
tree | cc3f8df01fda738a20d2f153a3d048ac9bc74297 /arch/ia64/include | |
parent | 272ecbe5919d057388bbbea751fad5471aaf3f02 (diff) |
pci-dma: ia64: use include/linux/pci-dma.h
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/include')
-rw-r--r-- | arch/ia64/include/asm/pci.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h index 55281aabe5f2..4adf22762277 100644 --- a/arch/ia64/include/asm/pci.h +++ b/arch/ia64/include/asm/pci.h | |||
@@ -56,19 +56,7 @@ pcibios_penalize_isa_irq (int irq, int active) | |||
56 | 56 | ||
57 | #include <asm-generic/pci-dma-compat.h> | 57 | #include <asm-generic/pci-dma-compat.h> |
58 | 58 | ||
59 | /* pci_unmap_{single,page} is not a nop, thus... */ | 59 | #include <linux/pci-dma.h> |
60 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ | ||
61 | dma_addr_t ADDR_NAME; | ||
62 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ | ||
63 | __u32 LEN_NAME; | ||
64 | #define pci_unmap_addr(PTR, ADDR_NAME) \ | ||
65 | ((PTR)->ADDR_NAME) | ||
66 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \ | ||
67 | (((PTR)->ADDR_NAME) = (VAL)) | ||
68 | #define pci_unmap_len(PTR, LEN_NAME) \ | ||
69 | ((PTR)->LEN_NAME) | ||
70 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ | ||
71 | (((PTR)->LEN_NAME) = (VAL)) | ||
72 | 60 | ||
73 | #ifdef CONFIG_PCI | 61 | #ifdef CONFIG_PCI |
74 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 62 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |