Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / i2c / busses / i2c-iop3xx.h

diff --git a/drivers/i2c/busses/i2c-iop3xx.h b/drivers/i2c/busses/i2c-iop3xx.h
index 8485861f6a36dd01a9d30c86d1414fe1def11dbc..097e270955d0d2abce616dc81c07a1a7cf88668b 100644 (file)
--- a/drivers/i2c/busses/i2c-iop3xx.h
+++ b/drivers/i2c/busses/i2c-iop3xx.h
@@ -97,7 +97,7 @@
 #define        IOP3XX_I2C_IO_SIZE      0x18
 
 struct i2c_algo_iop3xx_data {
-       u32 ioaddr;
+       void __iomem *ioaddr;
        wait_queue_head_t waitq;
        spinlock_t lock;
        u32 SR_enabled, SR_received;