Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 05164ca995749d8a7f44615a50960b254ae25f4d..4f1f4be91d130ec83cf196e7ed0316e58809cd1e 100644 (file)
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -1,10 +1,8 @@
 /*
- * File: drivers/video/omap/omap2/rfbi.c
- *
  * OMAP2 Remote Frame Buffer Interface support
  *
  * Copyright (C) 2005 Nokia Corporation
- * Author: Juha Yrjölä <juha.yrjola@nokia.com>
+ * Author: Juha Yrj�l� <juha.yrjola@nokia.com>
  *        Imre Deak <imre.deak@nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -27,8 +25,7 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/clk.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
 
 #include <asm/arch/omapfb.h>
 
@@ -87,12 +84,12 @@ static inline u32 rfbi_read_reg(int idx)
 static int rfbi_get_clocks(void)
 {
        if (IS_ERR((rfbi.dss_ick = clk_get(rfbi.fbdev->dev, "dss_ick")))) {
-               dev_err(rfbi.fbdev->dev, "can't get dss_ick");
+               dev_err(rfbi.fbdev->dev, "can't get dss_ick\n");
                return PTR_ERR(rfbi.dss_ick);
        }
 
        if (IS_ERR((rfbi.dss1_fck = clk_get(rfbi.fbdev->dev, "dss1_fck")))) {
-               dev_err(rfbi.fbdev->dev, "can't get dss1_fck");
+               dev_err(rfbi.fbdev->dev, "can't get dss1_fck\n");
                clk_put(rfbi.dss_ick);
                return PTR_ERR(rfbi.dss1_fck);
        }
@@ -500,8 +497,8 @@ static void rfbi_set_bits_per_cycle(int bpc)
        rfbi_enable_clocks(1);
        l = rfbi_read_reg(RFBI_CONFIG0);
        l &= ~(0x03 << 0);
-       switch (bpc)
-       {
+
+       switch (bpc) {
        case 8:
                break;
        case 16:
@@ -586,6 +583,6 @@ const struct lcd_ctrl_extif omap2_ext_if = {
        .setup_tearsync         = rfbi_setup_tearsync,
        .enable_tearsync        = rfbi_enable_tearsync,
 
-       .max_transmit_size      = (u32)~0,
+       .max_transmit_size      = (u32) ~0,
 };