diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
| commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
| tree | f4421227b3065e786c9041cf0ce0073a249e011b /include/linux/dma-mapping.h | |
| parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
| parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/linux/dma-mapping.h')
| -rw-r--r-- | include/linux/dma-mapping.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 806c305332c1..2d80cc761a15 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h | |||
| @@ -14,7 +14,12 @@ enum dma_data_direction { | |||
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| 16 | #define DMA_64BIT_MASK 0xffffffffffffffffULL | 16 | #define DMA_64BIT_MASK 0xffffffffffffffffULL |
| 17 | #define DMA_40BIT_MASK 0x000000ffffffffffULL | ||
| 18 | #define DMA_39BIT_MASK 0x0000007fffffffffULL | ||
| 17 | #define DMA_32BIT_MASK 0x00000000ffffffffULL | 19 | #define DMA_32BIT_MASK 0x00000000ffffffffULL |
| 20 | #define DMA_31BIT_MASK 0x000000007fffffffULL | ||
| 21 | #define DMA_30BIT_MASK 0x000000003fffffffULL | ||
| 22 | #define DMA_29BIT_MASK 0x000000001fffffffULL | ||
| 18 | 23 | ||
| 19 | #include <asm/dma-mapping.h> | 24 | #include <asm/dma-mapping.h> |
| 20 | 25 | ||