Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / arch / sh / boards / mach-landisk / gio.c

diff --git a/arch/sh/boards/mach-landisk/gio.c b/arch/sh/boards/mach-landisk/gio.c
index 5280131..01e6abb 100644 (file)
--- a/arch/sh/boards/mach-landisk/gio.c
+++ b/arch/sh/boards/mach-landisk/gio.c
@@ -76,39 +76,39 @@ static long gio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                break;
 
        case GIODRV_IOCSGIODATA1:       /* write byte */
-               ctrl_outb((unsigned char)(0x0ff & data), addr);
+               __raw_writeb((unsigned char)(0x0ff & data), addr);
                break;
 
        case GIODRV_IOCSGIODATA2:       /* write word */
                if (addr & 0x01) {
                        return -EFAULT;
                }
-               ctrl_outw((unsigned short int)(0x0ffff & data), addr);
+               __raw_writew((unsigned short int)(0x0ffff & data), addr);
                break;
 
        case GIODRV_IOCSGIODATA4:       /* write long */
                if (addr & 0x03) {
                        return -EFAULT;
                }
-               ctrl_outl(data, addr);
+               __raw_writel(data, addr);
                break;
 
        case GIODRV_IOCGGIODATA1:       /* read byte */
-               data = ctrl_inb(addr);
+               data = __raw_readb(addr);
                break;
 
        case GIODRV_IOCGGIODATA2:       /* read word */
                if (addr & 0x01) {
                        return -EFAULT;
                }
-               data = ctrl_inw(addr);
+               data = __raw_readw(addr);
                break;
 
        case GIODRV_IOCGGIODATA4:       /* read long */
                if (addr & 0x03) {
                        return -EFAULT;
                }
-               data = ctrl_inl(addr);
+               data = __raw_readl(addr);
                break;
        default:
                return -EFAULT;