diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /include/asm-powerpc/vga.h | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
Diffstat (limited to 'include/asm-powerpc/vga.h')
| -rw-r--r-- | include/asm-powerpc/vga.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/vga.h b/include/asm-powerpc/vga.h index eadaf2f3d032..a2eac409c1ec 100644 --- a/include/asm-powerpc/vga.h +++ b/include/asm-powerpc/vga.h | |||
| @@ -41,9 +41,9 @@ static inline u16 scr_readw(volatile const u16 *addr) | |||
| 41 | extern unsigned long vgacon_remap_base; | 41 | extern unsigned long vgacon_remap_base; |
| 42 | 42 | ||
| 43 | #ifdef __powerpc64__ | 43 | #ifdef __powerpc64__ |
| 44 | #define VGA_MAP_MEM(x) ((unsigned long) ioremap((x), 0)) | 44 | #define VGA_MAP_MEM(x,s) ((unsigned long) ioremap((x), s)) |
| 45 | #else | 45 | #else |
| 46 | #define VGA_MAP_MEM(x) (x + vgacon_remap_base) | 46 | #define VGA_MAP_MEM(x,s) (x + vgacon_remap_base) |
| 47 | #endif | 47 | #endif |
| 48 | 48 | ||
| 49 | #define vga_readb(x) (*(x)) | 49 | #define vga_readb(x) (*(x)) |