diff options
| author | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-12-06 17:31:30 -0500 |
| commit | 3d5271f9883cba7b54762bc4fe027d4172f06db7 (patch) | |
| tree | ab8a881a14478598a0c8bda0d26c62cdccfffd6d /include/asm-generic/dma-mapping-broken.h | |
| parent | 378b2556f4e09fa6f87ff0cb5c4395ff28257d02 (diff) | |
| parent | 9115a6c787596e687df03010d97fccc5e0762506 (diff) | |
Pull release into acpica branch
Diffstat (limited to 'include/asm-generic/dma-mapping-broken.h')
| -rw-r--r-- | include/asm-generic/dma-mapping-broken.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h index fd9de9502dff..a7f1a55ce6b0 100644 --- a/include/asm-generic/dma-mapping-broken.h +++ b/include/asm-generic/dma-mapping-broken.h | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | static inline void * | 7 | static inline void * |
| 8 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, | 8 | dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, |
| 9 | int flag) | 9 | gfp_t flag) |
| 10 | { | 10 | { |
| 11 | BUG(); | 11 | BUG(); |
| 12 | return NULL; | 12 | return NULL; |