From 37f1f9f5cb7d708acba30d74f371539fa44aab68 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 15 Dec 2005 09:18:10 +0000 Subject: [PATCH] --- yaml --- r: 15179 b: refs/heads/master c: cd0306656c15f355e0e533cc0f08691bb98ca912 h: refs/heads/master i: 15177: da8a51ad7595954b733c56bc51948402da8f2f4d 15175: 5f13eec0118e6959419d3fce375e954b562f4721 v: v3 --- [refs] | 2 +- trunk/drivers/video/cyber2000fb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a816e63cf4dd..f0eb0b57b2f2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e896fd9861181140617aa9ff3a54dac25e46351d +refs/heads/master: cd0306656c15f355e0e533cc0f08691bb98ca912 diff --git a/trunk/drivers/video/cyber2000fb.c b/trunk/drivers/video/cyber2000fb.c index c589d23e7f91..a9300f930ef2 100644 --- a/trunk/drivers/video/cyber2000fb.c +++ b/trunk/drivers/video/cyber2000fb.c @@ -1512,7 +1512,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) * I/O cycles storing into a reserved memory space at * physical address 0x3000000 */ - unsigned char *iop; + unsigned char __iomem *iop; iop = ioremap(0x3000000, 0x5000); if (iop == NULL) { @@ -1526,7 +1526,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) writeb(EXT_BIU_MISC, iop + 0x3ce); writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf); - iounmap((void *)iop); + iounmap(iop); #else /* * Most other machine types are "normal", so