summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/vga.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-03 10:39:02 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-03 10:39:02 -0700
commit7e31aa11fc672bbe0dd0da59513c9efe3809ced7 (patch)
tree0aafe6a0045230950ce6b26579a053da12614a49 /arch/arm/include/asm/vga.h
parent071f4924844c435a3ae0cdbab7d7df2f1da85713 (diff)
parent9cb7117fa4858468014f76bd996076985111e955 (diff)
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5182/1: pxa: Fix pcm990 compilation [ARM] Fix explicit asm(-arm)?/arch-foo references [ARM] move include/asm-arm to arch/arm/include/asm [ARM] Remove explicit dependency for misc.o from compressed/Makefile [ARM] initrd: claim initrd memory exclusively [ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2) [ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout [ARM] add Sascha Hauer as Freescale i.MX Maintainer [ARM] i.MX: add missing clock functions exports [ARM] i.MX: remove set_imx_fb_info() export [ARM] mx1ads: make mmc platform data available for modules [ARM] mx2: add missing Kconfig dependency
Diffstat (limited to 'arch/arm/include/asm/vga.h')
-rw-r--r--arch/arm/include/asm/vga.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h
new file mode 100644
index 00000000000..1e0b913c3d7
--- /dev/null
+++ b/arch/arm/include/asm/vga.h
@@ -0,0 +1,12 @@
+#ifndef ASMARM_VGA_H
+#define ASMARM_VGA_H
+
+#include <asm/hardware.h>
+#include <asm/io.h>
+
+#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x))
+
+#define vga_readb(x) (*((volatile unsigned char *)x))
+#define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x))
+
+#endif