summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-03-10 15:23:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 15:52:42 -0800
commitf41b177157718abe9a93868bb76e47d4a6f3681d (patch)
tree555d8608a2fe320483c8761dcb2e80cc37b5e822 /arch/cris
parentc7e67ac1f329fa28b6a411335787c786de618cba (diff)
downloadlinux-3.10-f41b177157718abe9a93868bb76e47d4a6f3681d.tar.gz
linux-3.10-f41b177157718abe9a93868bb76e47d4a6f3681d.tar.bz2
linux-3.10-f41b177157718abe9a93868bb76e47d4a6f3681d.zip
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/cris')
-rw-r--r--arch/cris/include/asm/pci.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/include/asm/pci.h b/arch/cris/include/asm/pci.h
index 43cfa0ca058..9f1cd56da28 100644
--- a/arch/cris/include/asm/pci.h
+++ b/arch/cris/include/asm/pci.h
@@ -44,8 +44,6 @@ struct pci_dev;
*/
#define PCI_DMA_BUS_IS_PHYS (1)
-#include <linux/pci-dma.h>
-
#define HAVE_PCI_MMAP
extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
enum pci_mmap_state mmap_state, int write_combine);