OMAP: DISPC: Fix to disable also interface clocks.

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

diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index cb1fa5a543f58d9f04ef752ebe14a8984dd89ded..6a42c6a0cd9991466b1a77781873e05b3171fcd8 100644 (file)
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -1,6 +1,4 @@
 /*
- * File: drivers/video/omap/lcd-inn1610.c
- *
  * LCD panel support for the TI OMAP1610 Innovator board
  *
  * Copyright (C) 2004 Nokia Corporation
@@ -24,25 +22,23 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
-#include <asm/arch/gpio.h>
-#include <asm/arch/omapfb.h>
+#include <mach/gpio.h>
+#include <mach/omapfb.h>
 
 #define MODULE_NAME    "omapfb-lcd_h3"
 
-#define pr_err(fmt, args...) printk(KERN_ERR MODULE_NAME ": " fmt, ## args)
-
 static int innovator1610_panel_init(struct lcd_panel *panel,
                                    struct omapfb_device *fbdev)
 {
        int r = 0;
 
        if (omap_request_gpio(14)) {
-               pr_err("can't request GPIO 14\n");
+               pr_err(MODULE_NAME ": can't request GPIO 14\n");
                r = -1;
                goto exit;
        }
        if (omap_request_gpio(15)) {
-               pr_err("can't request GPIO 15\n");
+               pr_err(MODULE_NAME ": can't request GPIO 15\n");
                omap_free_gpio(14);
                r = -1;
                goto exit;
@@ -115,7 +111,8 @@ static int innovator1610_panel_remove(struct platform_device *pdev)
        return 0;
 }
 
-static int innovator1610_panel_suspend(struct platform_device *pdev, pm_message_t mesg)
+static int innovator1610_panel_suspend(struct platform_device *pdev,
+                                      pm_message_t mesg)
 {
        return 0;
 }