diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-10-28 12:18:07 -0400 |
| commit | 210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch) | |
| tree | f0816c90ae937a159f8bfec6018a6271223b954a /include/asm-sparc64/dma-mapping.h | |
| parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
| parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
Auto-update from upstream
Diffstat (limited to 'include/asm-sparc64/dma-mapping.h')
| -rw-r--r-- | include/asm-sparc64/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h index 1c5da41653a4..c7d5804ba76d 100644 --- a/include/asm-sparc64/dma-mapping.h +++ b/include/asm-sparc64/dma-mapping.h | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | struct device; | 10 | struct device; |
| 11 | 11 | ||
| 12 | static inline void *dma_alloc_coherent(struct device *dev, size_t size, | 12 | static inline void *dma_alloc_coherent(struct device *dev, size_t size, |
| 13 | dma_addr_t *dma_handle, int flag) | 13 | dma_addr_t *dma_handle, gfp_t flag) |
| 14 | { | 14 | { |
| 15 | BUG(); | 15 | BUG(); |
| 16 | return NULL; | 16 | return NULL; |