aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/include/asm/pci.h
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-03-10 18:23:23 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 18:52:41 -0500
commit08d925badd63a4e335905066152d96b83266987c (patch)
tree41890d32bf7346344862e12fa6abde7d9bb17cba /arch/alpha/include/asm/pci.h
parent3bc4e4590de89c2dfcfb1000344cd072574c9ad4 (diff)
pci-dma: alpha: use include/linux/pci-dma.h
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Acked-by: Matt Turner <mattst88@gmail.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/alpha/include/asm/pci.h')
-rw-r--r--arch/alpha/include/asm/pci.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index dd8dcabf160f..47659464ef45 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -119,19 +119,7 @@ pci_dma_mapping_error(struct pci_dev *pdev, dma_addr_t dma_addr)
119extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int); 119extern void pci_unmap_single(struct pci_dev *, dma_addr_t, size_t, int);
120extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int); 120extern void pci_unmap_page(struct pci_dev *, dma_addr_t, size_t, int);
121 121
122/* pci_unmap_{single,page} is not a nop, thus... */ 122#include <linux/pci-dma.h>
123#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \
124 dma_addr_t ADDR_NAME;
125#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \
126 __u32 LEN_NAME;
127#define pci_unmap_addr(PTR, ADDR_NAME) \
128 ((PTR)->ADDR_NAME)
129#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \
130 (((PTR)->ADDR_NAME) = (VAL))
131#define pci_unmap_len(PTR, LEN_NAME) \
132 ((PTR)->LEN_NAME)
133#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \
134 (((PTR)->LEN_NAME) = (VAL))
135 123
136/* Map a set of buffers described by scatterlist in streaming mode for 124/* Map a set of buffers described by scatterlist in streaming mode for
137 PCI DMA. This is the scatter-gather version of the above 125 PCI DMA. This is the scatter-gather version of the above