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-mips
/
vga.h
diff --git
a/include/asm-mips/vga.h
b/include/asm-mips/vga.h
index
34755c0
..
c1dd0b1
100644
(file)
--- a/
include/asm-mips/vga.h
+++ b/
include/asm-mips/vga.h
@@
-13,7
+13,7
@@
* access the videoram directly without any black magic.
*/
* access the videoram directly without any black magic.
*/
-#define VGA_MAP_MEM(x
)
(0xb0000000L + (unsigned long)(x))
+#define VGA_MAP_MEM(x
,s)
(0xb0000000L + (unsigned long)(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))