Merge branch 'kvm-updates/2.6.31' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[firefly-linux-kernel-4.4.55.git] / arch / sh / drivers / pci / fixups-lboxre2.c

diff --git a/arch/sh/drivers/pci/fixups-lboxre2.c b/arch/sh/drivers/pci/fixups-lboxre2.c
index 40b19bdfb891f78524efa1d8b7b145b53635e445..1c1d41255ec0fd16c12f0db70749e94e74431d10 100644 (file)
--- a/arch/sh/drivers/pci/fixups-lboxre2.c
+++ b/arch/sh/drivers/pci/fixups-lboxre2.c
@@ -18,7 +18,7 @@ int pci_fixup_pcic(void)
 {
        unsigned long bcr1, mcr;
 
-       bcr1 = inl(SH7751_BCR1);
+       bcr1 = ctrl_inl(SH7751_BCR1);
        bcr1 |= 0x40080000;     /* Enable Bit 19 BREQEN, set PCIC to slave */
        pci_write_reg(bcr1, SH4_PCIBCR1);
 
@@ -28,7 +28,7 @@ int pci_fixup_pcic(void)
        pci_write_reg(0xfb900047, SH7751_PCICONF1);
        pci_write_reg(0xab000001, SH7751_PCICONF4);
 
-       mcr = inl(SH7751_MCR);
+       mcr = ctrl_inl(SH7751_MCR);
        mcr = (mcr & PCIMCR_MRSET_OFF) & PCIMCR_RFSH_OFF;
        pci_write_reg(mcr, SH4_PCIMCR);