diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2005-12-15 04:18:10 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-15 13:04:30 -0500 |
commit | cd0306656c15f355e0e533cc0f08691bb98ca912 (patch) | |
tree | 78f79d83fd8ecf9b72bc5ba97e40078b66b87bce | |
parent | e896fd9861181140617aa9ff3a54dac25e46351d (diff) |
[PATCH] cyber2000fb.c __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-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) | |||
1512 | * I/O cycles storing into a reserved memory space at | 1512 | * I/O cycles storing into a reserved memory space at |
1513 | * physical address 0x3000000 | 1513 | * physical address 0x3000000 |
1514 | */ | 1514 | */ |
1515 | unsigned char *iop; | 1515 | unsigned char __iomem *iop; |
1516 | 1516 | ||
1517 | iop = ioremap(0x3000000, 0x5000); | 1517 | iop = ioremap(0x3000000, 0x5000); |
1518 | if (iop == NULL) { | 1518 | if (iop == NULL) { |
@@ -1526,7 +1526,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) | |||
1526 | writeb(EXT_BIU_MISC, iop + 0x3ce); | 1526 | writeb(EXT_BIU_MISC, iop + 0x3ce); |
1527 | writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf); | 1527 | writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf); |
1528 | 1528 | ||
1529 | iounmap((void *)iop); | 1529 | iounmap(iop); |
1530 | #else | 1530 | #else |
1531 | /* | 1531 | /* |
1532 | * Most other machine types are "normal", so | 1532 | * Most other machine types are "normal", so |