summaryrefslogtreecommitdiffstats
path: root/arch/parisc/include
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/parisc/include
parentc7e67ac1f329fa28b6a411335787c786de618cba (diff)
downloadlinux-f41b177157718abe9a93868bb76e47d4a6f3681d.tar.gz
linux-f41b177157718abe9a93868bb76e47d4a6f3681d.tar.bz2
linux-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/parisc/include')
-rw-r--r--arch/parisc/include/asm/pci.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/pci.h b/arch/parisc/include/asm/pci.h
index 632088d0aa67..2242a5c636c2 100644
--- a/arch/parisc/include/asm/pci.h
+++ b/arch/parisc/include/asm/pci.h
@@ -183,8 +183,6 @@ struct pci_bios_ops {
void (*fixup_bus)(struct pci_bus *bus);
};
-#include <linux/pci-dma.h>
-
/*
** Stuff declared in arch/parisc/kernel/pci.c
*/