diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/asm-sh/scatterlist.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-sh/scatterlist.h')
| -rw-r--r-- | include/asm-sh/scatterlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sh/scatterlist.h b/include/asm-sh/scatterlist.h index a7d0d1856a99..2084d0373693 100644 --- a/include/asm-sh/scatterlist.h +++ b/include/asm-sh/scatterlist.h | |||
| @@ -13,7 +13,7 @@ struct scatterlist { | |||
| 13 | unsigned int length; | 13 | unsigned int length; |
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| 16 | #define ISA_DMA_THRESHOLD (0x1fffffff) | 16 | #define ISA_DMA_THRESHOLD PHYS_ADDR_MASK |
| 17 | 17 | ||
| 18 | /* These macros should be used after a pci_map_sg call has been done | 18 | /* These macros should be used after a pci_map_sg call has been done |
| 19 | * to get bus addresses of each of the SG entries and their lengths. | 19 | * to get bus addresses of each of the SG entries and their lengths. |