diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-24 01:52:47 -0400 |
| commit | 23930fa1cebfea6f79881c588ccd1b0781e49e3f (patch) | |
| tree | 36d29e3f83661c4f5f45b6f74ac0d5f9886867a8 /include/asm-s390/dma.h | |
| parent | 36b35a5be0e4b406acd816e2122d153e875105be (diff) | |
| parent | 4f5537de7c1531398e84e18a24f667e49cc94208 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-s390/dma.h')
| -rw-r--r-- | include/asm-s390/dma.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-s390/dma.h b/include/asm-s390/dma.h index 02720c449cd8..7425c6af6cd4 100644 --- a/include/asm-s390/dma.h +++ b/include/asm-s390/dma.h | |||
| @@ -11,6 +11,6 @@ | |||
| 11 | 11 | ||
| 12 | #define MAX_DMA_ADDRESS 0x80000000 | 12 | #define MAX_DMA_ADDRESS 0x80000000 |
| 13 | 13 | ||
| 14 | #define free_dma(x) | 14 | #define free_dma(x) do { } while (0) |
| 15 | 15 | ||
| 16 | #endif /* _ASM_DMA_H */ | 16 | #endif /* _ASM_DMA_H */ |