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 Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-x86_64
/
vga.h
diff --git
a/include/asm-x86_64/vga.h
b/include/asm-x86_64/vga.h
index
ef0c0e5
..
0ecf68a
100644
(file)
--- a/
include/asm-x86_64/vga.h
+++ b/
include/asm-x86_64/vga.h
@@
-12,7
+12,7
@@
* access the videoram directly without any black magic.
*/
* access the videoram directly without any black magic.
*/
-#define VGA_MAP_MEM(x) (unsigned long)phys_to_virt(x)
+#define VGA_MAP_MEM(x
,s
) (unsigned long)phys_to_virt(x)
#define vga_readb(x) (*(x))
#define vga_writeb(x,y) (*(y) = (x))
#define vga_readb(x) (*(x))
#define vga_writeb(x,y) (*(y) = (x))