diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/include/asm/dma-mapping.h | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 69ce0727edb..b5ccc6a993d 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h | |||
| @@ -298,7 +298,15 @@ extern void dmabounce_unregister_dev(struct device *); | |||
| 298 | * DMA access and 1 if the buffer needs to be bounced. | 298 | * DMA access and 1 if the buffer needs to be bounced. |
| 299 | * | 299 | * |
| 300 | */ | 300 | */ |
| 301 | #ifdef CONFIG_SA1111 | ||
| 301 | extern int dma_needs_bounce(struct device*, dma_addr_t, size_t); | 302 | extern int dma_needs_bounce(struct device*, dma_addr_t, size_t); |
| 303 | #else | ||
| 304 | static inline int dma_needs_bounce(struct device *dev, dma_addr_t addr, | ||
| 305 | size_t size) | ||
| 306 | { | ||
| 307 | return 0; | ||
| 308 | } | ||
| 309 | #endif | ||
| 302 | 310 | ||
| 303 | /* | 311 | /* |
| 304 | * The DMA API, implemented by dmabounce.c. See below for descriptions. | 312 | * The DMA API, implemented by dmabounce.c. See below for descriptions. |