diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-10 18:23:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:41 -0500 |
| commit | ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11 (patch) | |
| tree | 04ad7ebf314531919636b774a2bbcd755fff3f24 /arch/arm/include | |
| parent | 08d925badd63a4e335905066152d96b83266987c (diff) | |
pci-dma: arm: use include/linux/pci-dma.h
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
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/arm/include')
| -rw-r--r-- | arch/arm/include/asm/pci.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/include/asm/pci.h b/arch/arm/include/asm/pci.h index 226cddd2fb65..aea3450dd27a 100644 --- a/arch/arm/include/asm/pci.h +++ b/arch/arm/include/asm/pci.h | |||
| @@ -30,16 +30,7 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) | |||
| 30 | */ | 30 | */ |
| 31 | #define PCI_DMA_BUS_IS_PHYS (1) | 31 | #define PCI_DMA_BUS_IS_PHYS (1) |
| 32 | 32 | ||
| 33 | /* | 33 | #include <linux/pci-dma.h> |
| 34 | * Whether pci_unmap_{single,page} is a nop depends upon the | ||
| 35 | * configuration. | ||
| 36 | */ | ||
| 37 | #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME; | ||
| 38 | #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME; | ||
| 39 | #define pci_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME) | ||
| 40 | #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) (((PTR)->ADDR_NAME) = (VAL)) | ||
| 41 | #define pci_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME) | ||
| 42 | #define pci_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL)) | ||
| 43 | 34 | ||
| 44 | #ifdef CONFIG_PCI | 35 | #ifdef CONFIG_PCI |
| 45 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, | 36 | static inline void pci_dma_burst_advice(struct pci_dev *pdev, |
