diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-01 01:20:30 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-08-03 22:02:00 -0400 |
commit | b8b572e1015f81b4e748417be2629dfe51ab99f9 (patch) | |
tree | 7df58667d5ed71d6c8f8f4ce40ca16b6fb776d0b /include/asm-powerpc/vga.h | |
parent | 2b12a4c524812fb3f6ee590a02e65b95c8c32229 (diff) |
powerpc: Move include files to arch/powerpc/include/asm
from include/asm-powerpc. This is the result of a
mkdir arch/powerpc/include/asm
git mv include/asm-powerpc/* arch/powerpc/include/asm
Followed by a few documentation/comment fixups and a couple of places
where <asm-powepc/...> was being used explicitly. Of the latter only
one was outside the arch code and it is a driver only built for powerpc.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/vga.h')
-rw-r--r-- | include/asm-powerpc/vga.h | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/include/asm-powerpc/vga.h b/include/asm-powerpc/vga.h deleted file mode 100644 index a2eac409c1ec..000000000000 --- a/include/asm-powerpc/vga.h +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | #ifndef _ASM_POWERPC_VGA_H_ | ||
2 | #define _ASM_POWERPC_VGA_H_ | ||
3 | |||
4 | #ifdef __KERNEL__ | ||
5 | |||
6 | /* | ||
7 | * Access to VGA videoram | ||
8 | * | ||
9 | * (c) 1998 Martin Mares <mj@ucw.cz> | ||
10 | */ | ||
11 | |||
12 | |||
13 | #include <asm/io.h> | ||
14 | |||
15 | |||
16 | #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) | ||
17 | |||
18 | #define VT_BUF_HAVE_RW | ||
19 | /* | ||
20 | * These are only needed for supporting VGA or MDA text mode, which use little | ||
21 | * endian byte ordering. | ||
22 | * In other cases, we can optimize by using native byte ordering and | ||
23 | * <linux/vt_buffer.h> has already done the right job for us. | ||
24 | */ | ||
25 | |||
26 | static inline void scr_writew(u16 val, volatile u16 *addr) | ||
27 | { | ||
28 | st_le16(addr, val); | ||
29 | } | ||
30 | |||
31 | static inline u16 scr_readw(volatile const u16 *addr) | ||
32 | { | ||
33 | return ld_le16(addr); | ||
34 | } | ||
35 | |||
36 | #define VT_BUF_HAVE_MEMCPYW | ||
37 | #define scr_memcpyw memcpy | ||
38 | |||
39 | #endif /* !CONFIG_VGA_CONSOLE && !CONFIG_MDA_CONSOLE */ | ||
40 | |||
41 | extern unsigned long vgacon_remap_base; | ||
42 | |||
43 | #ifdef __powerpc64__ | ||
44 | #define VGA_MAP_MEM(x,s) ((unsigned long) ioremap((x), s)) | ||
45 | #else | ||
46 | #define VGA_MAP_MEM(x,s) (x + vgacon_remap_base) | ||
47 | #endif | ||
48 | |||
49 | #define vga_readb(x) (*(x)) | ||
50 | #define vga_writeb(x,y) (*(y) = (x)) | ||
51 | |||
52 | #endif /* __KERNEL__ */ | ||
53 | #endif /* _ASM_POWERPC_VGA_H_ */ | ||