Commit 258e1e73 authored Sep 10, 2013 by Leonid Yegoshin Committed by Ralf Baechle Sep 18, 2013

MIPS: Fix VGA_MAP_MEM macro.



Use the CKSEG1ADDR macro when calculating VGA_MAP_MEM.

[ralf@linux-mips.org: Include <asm/addrspace.h for CKSEG1ADDR.]

Signed-off-by: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5814/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 9c9b415c

arch/mips/include/asm/vga.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@
		#ifndef _ASM_VGA_H
		#define _ASM_VGA_H

		#include <asm/addrspace.h>
		#include <asm/byteorder.h>

		/*
		@@ -13,7 +14,7 @@
		* access the videoram directly without any black magic.
		*/

		#define VGA_MAP_MEM(x, s) (0xb0000000L + (unsigned long)(x))
		#define VGA_MAP_MEM(x, s) CKSEG1ADDR(0x10000000L + (unsigned long)(x))

		#define vga_readb(x) (*(x))
		#define vga_writeb(x, y) (*(y) = (x))