Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / arch / cris / arch-v32 / mach-a3 / dma.c

diff --git a/arch/cris/arch-v32/mach-a3/dma.c b/arch/cris/arch-v32/mach-a3/dma.c
index 0c19fede0e6575eca5c55dd77618e9a6045d4e25..f35e4f65f4efa8b0390d34e9f414246802793da0 100644 (file)
--- a/arch/cris/arch-v32/mach-a3/dma.c
+++ b/arch/cris/arch-v32/mach-a3/dma.c
@@ -2,7 +2,7 @@
 
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
-#include <asm/arch/mach/dma.h>
+#include <mach/dma.h>
 #include <hwregs/reg_map.h>
 #include <hwregs/reg_rdwr.h>
 #include <hwregs/marb_defs.h>
@@ -24,7 +24,7 @@ int crisv32_request_dma(unsigned int dmanr, const char *device_id,
        reg_clkgen_rw_clk_ctrl clk_ctrl;
        reg_strmux_rw_cfg strmux_cfg;
 
-       if (crisv32_arbiter_allocate_bandwith(dmanr,
+       if (crisv32_arbiter_allocate_bandwidth(dmanr,
                        options & DMA_INT_MEM ? INT_REGION : EXT_REGION,
                        bandwidth))
                return -ENOMEM;