diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2002-04-14 22:22:28 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2002-04-14 22:22:28 +0100 |
| commit | 41c9b18fc8f054e487170e9239f9081e855f2994 (patch) | |
| tree | e216b289d1bc7c9c1f35a89c98b717918a4ddacb /include | |
| parent | a5358dec012cd1bd08de63f88c052d04d2001f93 (diff) | |
PCI address mapping macros depend on CONFIG_PCI not CONFIG_SA1111
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/pci.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h index 041bbaddd971..c09fdafefc1d 100644 --- a/include/asm-arm/pci.h +++ b/include/asm-arm/pci.h @@ -95,30 +95,25 @@ pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr, size_t size, int di /* nothing to do */ } -/* Whether pci_unmap_{single,page} is a nop depends upon the +/* + * Whether pci_unmap_{single,page} is a nop depends upon the * configuration. */ -#ifdef CONFIG_SA1111 -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \ - dma_addr_t ADDR_NAME; -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) \ - __u32 LEN_NAME; -#define pci_unmap_addr(PTR, ADDR_NAME) \ - ((PTR)->ADDR_NAME) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \ - (((PTR)->ADDR_NAME) = (VAL)) -#define pci_unmap_len(PTR, LEN_NAME) \ - ((PTR)->LEN_NAME) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ - (((PTR)->LEN_NAME) = (VAL)) -#else /* !(CONFIG_SA1111) */ +#ifdef CONFIG_PCI +#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME; +#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) __u32 LEN_NAME; +#define pci_unmap_addr(PTR, ADDR_NAME) ((PTR)->ADDR_NAME) +#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) (((PTR)->ADDR_NAME) = (VAL)) +#define pci_unmap_len(PTR, LEN_NAME) ((PTR)->LEN_NAME) +#define pci_unmap_len_set(PTR, LEN_NAME, VAL) (((PTR)->LEN_NAME) = (VAL)) +#else #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) #define DECLARE_PCI_UNMAP_LEN(LEN_NAME) #define pci_unmap_addr(PTR, ADDR_NAME) (0) #define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) #define pci_unmap_len(PTR, LEN_NAME) (0) #define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) -#endif /* CONFIG_SA1111 */ +#endif /* CONFIG_PCI */ /* Map a set of buffers described by scatterlist in streaming * mode for DMA. This is the scather-gather version of the |