viafb: move some include files to include/linux

[pandora-kernel.git] / drivers / video / via / via_i2c.c

diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
index febc1dd..da9e4ca 100644 (file)
--- a/drivers/video/via/via_i2c.c
+++ b/drivers/video/via/via_i2c.c
@@ -20,9 +20,11 @@
  */
 
 #include <linux/platform_device.h>
-#include "via-core.h"
-#include "via_i2c.h"
-#include "global.h"
+#include <linux/delay.h>
+#include <linux/spinlock.h>
+#include <linux/module.h>
+#include <linux/via-core.h>
+#include <linux/via_i2c.h>
 
 /*
  * There can only be one set of these, so there's no point in having
@@ -52,7 +54,7 @@ static void via_i2c_setscl(void *data, int state)
                val |= 0x80;
                break;
        default:
-               DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n");
+               printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n");
        }
        via_write_reg(adap_data->io_port, adap_data->ioport_index, val);
        spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags);
@@ -104,7 +106,7 @@ static void via_i2c_setsda(void *data, int state)
                val |= 0x40;
                break;
        default:
-               DEBUG_MSG("viafb_i2c: specify wrong i2c type.\n");
+               printk(KERN_ERR "viafb_i2c: specify wrong i2c type.\n");
        }
        via_write_reg(adap_data->io_port, adap_data->ioport_index, val);
        spin_unlock_irqrestore(&i2c_vdev->reg_lock, flags);
@@ -175,8 +177,6 @@ static int create_i2c_bus(struct i2c_adapter *adapter,
                          struct via_port_cfg *adap_cfg,
                          struct pci_dev *pdev)
 {
-       DEBUG_MSG(KERN_DEBUG "viafb: creating bus adap=0x%p, algo_bit_data=0x%p, adap_cfg=0x%p\n", adapter, algo, adap_cfg);
-
        algo->setsda = via_i2c_setsda;
        algo->setscl = via_i2c_setscl;
        algo->getsda = via_i2c_getsda;