diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-08-13 19:59:15 -0400 |
| commit | 7d72e6fa56c4100b9669efe0044f77ed9eb785a1 (patch) | |
| tree | 5e90bf4969809a1ab20b97432b85be20ccfaa1f4 /arch/sh/include/asm/page.h | |
| parent | ba00376b0b13f234d839541a7b36a5bf5c2a4036 (diff) | |
| parent | 2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/sh/include/asm/page.h')
| -rw-r--r-- | arch/sh/include/asm/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h index fb703d120d09..c4e0b3d472b9 100644 --- a/arch/sh/include/asm/page.h +++ b/arch/sh/include/asm/page.h | |||
| @@ -180,7 +180,7 @@ typedef struct page *pgtable_t; | |||
| 180 | * Some drivers need to perform DMA into kmalloc'ed buffers | 180 | * Some drivers need to perform DMA into kmalloc'ed buffers |
| 181 | * and so we have to increase the kmalloc minalign for this. | 181 | * and so we have to increase the kmalloc minalign for this. |
| 182 | */ | 182 | */ |
| 183 | #define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES | 183 | #define ARCH_DMA_MINALIGN L1_CACHE_BYTES |
| 184 | 184 | ||
| 185 | #ifdef CONFIG_SUPERH64 | 185 | #ifdef CONFIG_SUPERH64 |
| 186 | /* | 186 | /* |