diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /include/asm-generic/dma-mapping-broken.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
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; |