aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/include
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-03-10 18:23:30 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 18:52:42 -0500
commitf41b177157718abe9a93868bb76e47d4a6f3681d (patch)
tree555d8608a2fe320483c8761dcb2e80cc37b5e822 /arch/alpha/include
parentc7e67ac1f329fa28b6a411335787c786de618cba (diff)
pci-dma: add linux/pci-dma.h to linux/pci.h
All the architectures properly set NEED_DMA_MAP_STATE now so we can safely add linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h inclusion in arch's asm/pci.h Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: Arnd Bergmann <arnd@arndb.de> 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')
-rw-r--r--arch/alpha/include/asm/pci.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/pci.h b/arch/alpha/include/asm/pci.h
index 47659464ef45..e1846ba6aaba 100644
--- a/arch/alpha/include/asm/pci.h
+++ b/arch/alpha/include/asm/pci.h
@@ -119,8 +119,6 @@ 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#include <linux/pci-dma.h>
123
124/* Map a set of buffers described by scatterlist in streaming mode for 122/* Map a set of buffers described by scatterlist in streaming mode for
125 PCI DMA. This is the scatter-gather version of the above 123 PCI DMA. This is the scatter-gather version of the above
126 pci_map_single interface. Here the scatter gather list elements 124 pci_map_single interface. Here the scatter gather list elements