diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 10:31:28 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-26 10:31:28 +0200 |
commit | ef2e58ea6b9931c3a4816c66593da49bb20e3b24 (patch) | |
tree | ce7432add3becbe78de4ea06425cd2d9e91f4ada /arch/mips/jazz/jazzdma.c | |
parent | [MTD] [MAPS] fix plat-ram printk format (diff) | |
parent | Linux 2.6.21 (diff) | |
download | linux-ef2e58ea6b9931c3a4816c66593da49bb20e3b24.tar.xz linux-ef2e58ea6b9931c3a4816c66593da49bb20e3b24.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/jazz/jazzdma.c')
-rw-r--r-- | arch/mips/jazz/jazzdma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index 46e421e14348..e8e0ffb9354d 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c @@ -67,7 +67,8 @@ void __init vdma_init(void) * aligned and should be uncached to avoid cache flushing after every * update. */ - vdma_pagetable_start = alloc_bootmem_low_pages(VDMA_PGTBL_SIZE); + vdma_pagetable_start = + (unsigned long) alloc_bootmem_low_pages(VDMA_PGTBL_SIZE); if (!vdma_pagetable_start) BUG(); dma_cache_wback_inv(vdma_pagetable_start, VDMA_PGTBL_SIZE); |