diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-10 18:23:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:42 -0500 |
| commit | f41b177157718abe9a93868bb76e47d4a6f3681d (patch) | |
| tree | 555d8608a2fe320483c8761dcb2e80cc37b5e822 /include/linux/pci.h | |
| parent | c7e67ac1f329fa28b6a411335787c786de618cba (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 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index cd5809a5963e..7fd5c574efae 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
| @@ -904,6 +904,7 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode, | |||
| 904 | unsigned int command_bits, bool change_bridge); | 904 | unsigned int command_bits, bool change_bridge); |
| 905 | /* kmem_cache style wrapper around pci_alloc_consistent() */ | 905 | /* kmem_cache style wrapper around pci_alloc_consistent() */ |
| 906 | 906 | ||
| 907 | #include <linux/pci-dma.h> | ||
| 907 | #include <linux/dmapool.h> | 908 | #include <linux/dmapool.h> |
| 908 | 909 | ||
| 909 | #define pci_pool dma_pool | 910 | #define pci_pool dma_pool |