aboutsummaryrefslogtreecommitdiff
path: root/include/asm-sparc64/vga.h
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2008-06-19 20:52:54 +0200
committerDavid S. Miller <davem@davemloft.net>2008-07-17 21:44:58 -0700
commit075ae525327ed789f5b755a8042ee6f3a0e2ab7b (patch)
treee45fd43b3fdeef53fef9f02e0a0c58a43ea9ac11 /include/asm-sparc64/vga.h
parenta00736e936c2a1e9c36f22f6f3a69392eaab51f4 (diff)
sparc: when header files are equal use asm-sparc version
Used the following script to find equal header files: SPARC64=`ls asm-sparc64` for FILE in ${SPARC64}; do cmp -s asm-sparc/$FILE asm-sparc64/$FILE; if [ $? = 0 ]; then printf "#include <asm-sparc/%s>\n" $FILE > asm-sparc64/$FILE fi done A few of the equal files are a simple include from asm-generic, but by including the file from asm-sparc we know they are equal for sparc and sparc64. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc64/vga.h')
-rw-r--r--include/asm-sparc64/vga.h34
1 files changed, 1 insertions, 33 deletions
diff --git a/include/asm-sparc64/vga.h b/include/asm-sparc64/vga.h
index c69d5b2ba19..fbf4d58a56f 100644
--- a/include/asm-sparc64/vga.h
+++ b/include/asm-sparc64/vga.h
@@ -1,33 +1 @@
-/*
- * Access to VGA videoram
- *
- * (c) 1998 Martin Mares <mj@ucw.cz>
- */
-
-#ifndef _LINUX_ASM_VGA_H_
-#define _LINUX_ASM_VGA_H_
-
-#include <asm/types.h>
-
-#define VT_BUF_HAVE_RW
-
-#undef scr_writew
-#undef scr_readw
-
-static inline void scr_writew(u16 val, u16 *addr)
-{
- BUG_ON((long) addr >= 0);
-
- *addr = val;
-}
-
-static inline u16 scr_readw(const u16 *addr)
-{
- BUG_ON((long) addr >= 0);
-
- return *addr;
-}
-
-#define VGA_MAP_MEM(x,s) (x)
-
-#endif
+#include <asm-sparc/vga.h>