diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 11:39:33 -0500 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /include/asm-generic/dma-mapping.h | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'include/asm-generic/dma-mapping.h')
| -rw-r--r-- | include/asm-generic/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/dma-mapping.h b/include/asm-generic/dma-mapping.h index 747d790295f3..1b356207712c 100644 --- a/include/asm-generic/dma-mapping.h +++ b/include/asm-generic/dma-mapping.h | |||
| @@ -274,7 +274,7 @@ dma_get_cache_alignment(void) | |||
| 274 | { | 274 | { |
| 275 | /* no easy way to get cache size on all processors, so return | 275 | /* no easy way to get cache size on all processors, so return |
| 276 | * the maximum possible, to be safe */ | 276 | * the maximum possible, to be safe */ |
| 277 | return (1 << L1_CACHE_SHIFT_MAX); | 277 | return (1 << INTERNODE_CACHE_SHIFT); |
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | static inline void | 280 | static inline void |
