diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /include/asm-s390/dma.h | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
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 */ |