Merge tag 'sound-fix-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[linux.git] / drivers / video / fbdev / chipsfb.c

diff --git a/drivers/video/fbdev/chipsfb.c b/drivers/video/fbdev/chipsfb.c
index f103665cad431c449422b87bea145934444a46e4..40182ed85648390ba6c803a555373b5fb63ae2d9 100644 (file)
--- a/drivers/video/fbdev/chipsfb.c
+++ b/drivers/video/fbdev/chipsfb.c
@@ -27,7 +27,6 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/console.h>
-#include <asm/io.h>
 
 #ifdef CONFIG_PMAC_BACKLIGHT
 #include <asm/backlight.h>
@@ -401,7 +400,7 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
 #endif /* CONFIG_PMAC_BACKLIGHT */
 
 #ifdef CONFIG_PPC
-       p->screen_base = __ioremap(addr, 0x200000, _PAGE_NO_CACHE);
+       p->screen_base = ioremap_wc(addr, 0x200000);
 #else
        p->screen_base = ioremap(addr, 0x200000);
 #endif