diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-17 14:51:24 -0400 |
| commit | 5dd8816aeb1f068ade0349a22009ff7a66f25413 (patch) | |
| tree | c56ff327b1dfa8868b4208aea9ac4158e3bfe308 /include/linux/dma-mapping.h | |
| parent | f03cc4fd927357bd4b3cea1a053b9f9d8f1731cc (diff) | |
| parent | 0c056c50a6218e0e577817c16ba8851af593d742 (diff) | |
| download | kernel_samsung_aries-5dd8816aeb1f068ade0349a22009ff7a66f25413.zip kernel_samsung_aries-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.gz kernel_samsung_aries-5dd8816aeb1f068ade0349a22009ff7a66f25413.tar.bz2 | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/dma-mapping.h')
| -rw-r--r-- | include/linux/dma-mapping.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index ff61817..635690c 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -14,6 +14,7 @@ enum dma_data_direction { }; #define DMA_64BIT_MASK 0xffffffffffffffffULL +#define DMA_48BIT_MASK 0x0000ffffffffffffULL #define DMA_40BIT_MASK 0x000000ffffffffffULL #define DMA_39BIT_MASK 0x0000007fffffffffULL #define DMA_32BIT_MASK 0x00000000ffffffffULL |