git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-alpha
/
vga.h
diff --git
a/include/asm-alpha/vga.h
b/include/asm-alpha/vga.h
index
8ca4f6b
..
ed06f59
100644
(file)
--- a/
include/asm-alpha/vga.h
+++ b/
include/asm-alpha/vga.h
@@
-46,6
+46,6
@@
extern void scr_memcpyw(u16 *d, const u16 *s, unsigned int count);
#define vga_readb(a) readb((u8 __iomem *)(a))
#define vga_writeb(v,a) writeb(v, (u8 __iomem *)(a))
-#define VGA_MAP_MEM(x
) ((unsigned long) ioremap(x, 0
))
+#define VGA_MAP_MEM(x
,s) ((unsigned long) ioremap(x, s
))
#endif