1 files changed, 12 insertions, 11 deletions

diff --git a/arch/sh/drivers/dma/dmabrg.c b/arch/sh/drivers/dma/dmabrg.c
index 5e22689c2fcf..6ab9c4a15439 100644
--- a/arch/sh/drivers/dma/dmabrg.c
+++ b/arch/sh/drivers/dma/dmabrg.c
@@ -8,6 +8,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
+#include <linux/slab.h>
 #include <asm/dma.h>
 #include <asm/dmabrg.h>
 #include <asm/io.h>
@@ -86,8 +87,8 @@ static irqreturn_t dmabrg_irq(int irq, void *data)
         unsigned long dcr;
         unsigned int i;
 
-        dcr = ctrl_inl(DMABRGCR);
-        ctrl_outl(dcr & ~0x00ff0003, DMABRGCR); /* ack all */
+        dcr = __raw_readl(DMABRGCR);
+        __raw_writel(dcr & ~0x00ff0003, DMABRGCR);      /* ack all */
         dcr &= dcr >> 8;        /* ignore masked */
 
         /* USB stuff, get it out of the way first */
@@ -109,17 +110,17 @@ static irqreturn_t dmabrg_irq(int irq, void *data)
 static void dmabrg_disable_irq(unsigned int dmairq)
 {
         unsigned long dcr;
-        dcr = ctrl_inl(DMABRGCR);
+        dcr = __raw_readl(DMABRGCR);
         dcr &= ~(1 << ((dmairq > 1) ? dmairq + 22 : dmairq + 8));
-        ctrl_outl(dcr, DMABRGCR);
+        __raw_writel(dcr, DMABRGCR);
 }
 
 static void dmabrg_enable_irq(unsigned int dmairq)
 {
         unsigned long dcr;
-        dcr = ctrl_inl(DMABRGCR);
+        dcr = __raw_readl(DMABRGCR);
         dcr |= (1 << ((dmairq > 1) ? dmairq + 22 : dmairq + 8));
-        ctrl_outl(dcr, DMABRGCR);
+        __raw_writel(dcr, DMABRGCR);
 }
 
 int dmabrg_request_irq(unsigned int dmairq, void(*handler)(void*),
@@ -165,13 +166,13 @@ static int __init dmabrg_init(void)
                 printk(KERN_INFO "DMABRG: DMAC ch0 not reserved!\n");
 #endif
 
-        ctrl_outl(0, DMABRGCR);
-        ctrl_outl(0, DMACHCR0);
-        ctrl_outl(0x94000000, DMARSRA); /* enable DMABRG in DMAC 0 */
+        __raw_writel(0, DMABRGCR);
+        __raw_writel(0, DMACHCR0);
+        __raw_writel(0x94000000, DMARSRA);      /* enable DMABRG in DMAC 0 */
 
         /* enable DMABRG mode, enable the DMAC */
-        or = ctrl_inl(DMAOR);
-        ctrl_outl(or | DMAOR_BRG | DMAOR_DMEN, DMAOR);
+        or = __raw_readl(DMAOR);
+        __raw_writel(or | DMAOR_BRG | DMAOR_DMEN, DMAOR);
 
         ret = request_irq(DMABRGI0, dmabrg_irq, IRQF_DISABLED,
                         "DMABRG USB address error", NULL);