diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-27 16:00:49 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-27 16:00:49 -0700 |
| commit | 83b5938ce77bbbd9a04e5270ef2b3f17921bf0d4 (patch) | |
| tree | fa67d6dc9642d0e37ba164d667d9eea718027668 /include/linux | |
| parent | fdd8397497b389090a008f32bc67ba4f067bca1b (diff) | |
| parent | 23019a733bb83c8499f192fb428b7e6e81c95a34 (diff) | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
ARM: pxa: use common IOMEM definition
ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index e13117cbd2f7..5a736af3cc7a 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -77,7 +77,7 @@ static inline u64 dma_get_mask(struct device *dev) return DMA_BIT_MASK(32); } -#ifdef ARCH_HAS_DMA_SET_COHERENT_MASK +#ifdef CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK int dma_set_coherent_mask(struct device *dev, u64 mask); #else static inline int dma_set_coherent_mask(struct device *dev, u64 mask) |