Merge remote-tracking branch 'v4l-dvb/master'

[karo-tx-linux.git] / drivers / media / pci / netup_unidvb / netup_unidvb_i2c.c

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c b/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c
index eaaa2d0a5fba227c25ad90c75b729ea92b3b019d..c09c52bc6eabefe464546fc0d09f52146f537c7c 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c
@@ -320,7 +320,7 @@ static int netup_i2c_init(struct netup_unidvb_dev *ndev, int bus_num)
        i2c = &ndev->i2c[bus_num];
        spin_lock_init(&i2c->lock);
        init_waitqueue_head(&i2c->wq);
-       i2c->regs = (struct netup_i2c_regs *)(ndev->bmmio0 +
+       i2c->regs = (struct netup_i2c_regs __iomem *)(ndev->bmmio0 +
                (bus_num == 0 ? NETUP_I2C_BUS0_ADDR : NETUP_I2C_BUS1_ADDR));
        netup_i2c_reset(i2c);
        i2c->adap = netup_i2c_adapter;