Merge tag 'media/v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[people/ms/linux.git] / drivers / media / pci / netup_unidvb / netup_unidvb_spi.c

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
index 56773f3893d40e02d6b9cde1a72fcf0108ad350d..f33c0de3e8490737623655e8e98587b13f9ec487 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
@@ -45,7 +45,7 @@ struct netup_spi_regs {
 struct netup_spi {
        struct device                   *dev;
        struct spi_master               *master;
-       struct netup_spi_regs           *regs;
+       struct netup_spi_regs __iomem   *regs;
        u8 __iomem                      *mmio;
        spinlock_t                      lock;
        wait_queue_head_t               waitq;
@@ -200,7 +200,7 @@ int netup_spi_init(struct netup_unidvb_dev *ndev)
        spin_lock_init(&nspi->lock);
        init_waitqueue_head(&nspi->waitq);
        nspi->master = master;
-       nspi->regs = (struct netup_spi_regs *)(ndev->bmmio0 + 0x4000);
+       nspi->regs = (struct netup_spi_regs __iomem *)(ndev->bmmio0 + 0x4000);
        writew(2, &nspi->regs->clock_divider);
        writew(NETUP_UNIDVB_IRQ_SPI, ndev->bmmio0 + REG_IMASK_SET);
        ndev->spi = nspi;