diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-12-15 10:18:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-15 19:04:30 +0100 |
| commit | cd0306656c15f355e0e533cc0f08691bb98ca912 (patch) | |
| tree | 78f79d83fd8ecf9b72bc5ba97e40078b66b87bce /drivers/video/cyber2000fb.c | |
| parent | [PATCH] wdrtas.c: fix __user annotations (diff) | |
| download | linux-cd0306656c15f355e0e533cc0f08691bb98ca912.tar.xz linux-cd0306656c15f355e0e533cc0f08691bb98ca912.zip | |
[PATCH] cyber2000fb.c __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/cyber2000fb.c')
| -rw-r--r-- | drivers/video/cyber2000fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index c589d23e7f91..a9300f930ef2 100644 --- a/drivers/video/cyber2000fb.c +++ b/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 |