vserver 2.0 rc7

[linux-2.6.git] / drivers / i2c / busses / i2c-mpc.c

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index 67d6e7d..6f33496 100644 (file)
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -55,7 +55,7 @@
 #define CSR_RXAK 0x01
 
 struct mpc_i2c {
-       char *base;
+       void __iomem *base;
        u32 interrupt;
        wait_queue_head_t queue;
        struct i2c_adapter adap;
@@ -233,7 +233,7 @@ static int mpc_read(struct mpc_i2c *i2c, int target,
        return length;
 }
 
-static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
+static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
 {
        struct i2c_msg *pmsg;
        int i;
@@ -444,7 +444,7 @@ static int fsl_i2c_probe(struct device *device)
 
       fail_add:
        if (i2c->irq != 0)
-               free_irq(i2c->irq, 0);
+               free_irq(i2c->irq, NULL);
       fail_irq:
        iounmap(i2c->base);
       fail_map: