diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-11 00:23:30 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 00:52:42 +0100 |
| commit | f41b177157718abe9a93868bb76e47d4a6f3681d (patch) | |
| tree | 555d8608a2fe320483c8761dcb2e80cc37b5e822 /arch/x86/include/asm/pci.h | |
| parent | pci-dma: cris: use include/linux/pci-dma.h (diff) | |
| download | linux-f41b177157718abe9a93868bb76e47d4a6f3681d.tar.xz 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/x86/include/asm/pci.h')
| -rw-r--r-- | arch/x86/include/asm/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index e2655dc9b9cd..404a880ea325 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -108,8 +108,6 @@ void dma32_reserve_bootmem(void); /* implement the pci_ DMA API in terms of the generic device dma_ one */ #include <asm-generic/pci-dma-compat.h> -#include <linux/pci-dma.h> - /* generic pci stuff */ #include <asm-generic/pci.h> #define PCIBIOS_MAX_MEM_32 0xffffffff |