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-um/dma-mapping.h | |
| parent | e0f998930eb67c49f2862c58a45262ad0bc03eca (diff) | |
| parent | 260b23674fdb570f3235ce55892246bef1c24c2a (diff) | |
Auto-update from upstream
Diffstat (limited to 'include/asm-um/dma-mapping.h')
| -rw-r--r-- | include/asm-um/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h index 13e6291f7151..babd29895114 100644 --- a/include/asm-um/dma-mapping.h +++ b/include/asm-um/dma-mapping.h | |||
| @@ -19,7 +19,7 @@ dma_set_mask(struct device *dev, u64 dma_mask) | |||
| 19 | 19 | ||
| 20 | static inline void * | 20 | static inline void * |
| 21 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | 21 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, |
| 22 | int flag) | 22 | gfp_t flag) |
| 23 | { | 23 | { |
| 24 | BUG(); | 24 | BUG(); |
| 25 | return((void *) 0); | 25 | return((void *) 0); |