Merge omap-upstream

[linux-2.6-omap-h63xx.git] / drivers / video / omap / sossi.c

diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 715c4f2727575fb7573a6dfa2a449e7564e1a207..658b5da12acd5dcc1456110060ec29c5838caa76 100644 (file)
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -2,7 +2,7 @@
  * OMAP1 Special OptimiSed Screen Interface support
  *
  * Copyright (C) 2004-2005 Nokia Corporation
- * Author: Juha Yrjölä <juha.yrjola@nokia.com>
+ * Author: Juha Yrj�l� <juha.yrjola@nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -22,8 +22,7 @@
 #include <linux/mm.h>
 #include <linux/clk.h>
 #include <linux/irq.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <asm/arch/dma.h>
 #include <asm/arch/omapfb.h>
@@ -82,42 +81,42 @@ static struct {
 
 static inline u32 sossi_read_reg(int reg)
 {
-        return readl(sossi.base + reg);
+       return readl(sossi.base + reg);
 }
 
 static inline u16 sossi_read_reg16(int reg)
 {
-        return readw(sossi.base + reg);
+       return readw(sossi.base + reg);
 }
 
 static inline u8 sossi_read_reg8(int reg)
 {
-        return readb(sossi.base + reg);
+       return readb(sossi.base + reg);
 }
 
 static inline void sossi_write_reg(int reg, u32 value)
 {
-        writel(value, sossi.base + reg);
+       writel(value, sossi.base + reg);
 }
 
 static inline void sossi_write_reg16(int reg, u16 value)
 {
-        writew(value, sossi.base + reg);
+       writew(value, sossi.base + reg);
 }
 
 static inline void sossi_write_reg8(int reg, u8 value)
 {
-        writeb(value, sossi.base + reg);
+       writeb(value, sossi.base + reg);
 }
 
 static void sossi_set_bits(int reg, u32 bits)
 {
-        sossi_write_reg(reg, sossi_read_reg(reg) | bits);
+       sossi_write_reg(reg, sossi_read_reg(reg) | bits);
 }
 
 static void sossi_clear_bits(int reg, u32 bits)
 {
-        sossi_write_reg(reg, sossi_read_reg(reg) & ~bits);
+       sossi_write_reg(reg, sossi_read_reg(reg) & ~bits);
 }
 
 #define HZ_TO_PS(x)    (1000000000 / (x / 1000))