]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] cyber2000fb.c __iomem annotations
authorAl Viro <viro@ftp.linux.org.uk>
Thu, 15 Dec 2005 09:18:10 +0000 (09:18 +0000)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 15 Dec 2005 18:04:30 +0000 (10:04 -0800)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/video/cyber2000fb.c

index c589d23e7f914e6301bc39b7ed0d91f4c30ee7a3..a9300f930ef2a3022390758efd4271606fc39f6b 100644 (file)
@@ -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