git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
include
/
asm-xtensa
/
vga.h
diff --git
a/include/asm-xtensa/vga.h
b/include/asm-xtensa/vga.h
index
23d82f6
..
1fd8cab
100644
(file)
--- a/
include/asm-xtensa/vga.h
+++ b/
include/asm-xtensa/vga.h
@@
-11,7
+11,7
@@
#ifndef _XTENSA_VGA_H
#define _XTENSA_VGA_H
-#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))