diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-04-18 11:45:17 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2012-04-22 20:16:50 +0200 |
| commit | 5c3f968712cec168fa9775e8af0c0d6650e4bd47 (patch) | |
| tree | eeda9280328af4dbe23d81ec77ee51c58ebe3519 /include/video/vga.h | |
| parent | m68k: Make sure {read,write}s[bwl]() are always defined (diff) | |
| download | linux-5c3f968712cec168fa9775e8af0c0d6650e4bd47.tar.xz linux-5c3f968712cec168fa9775e8af0c0d6650e4bd47.zip | |
m68k/video: Create <asm/vga.h>
For now, it just contains the hack for cirrusfb on Amiga, which is moved
out of <video/vga.h> with some slight modifications (use raw_*() instead of
z_*(), which are defined on all m68k platforms).
This makes it safe to include <video/vga.h> in all contexts. Before it
could fail to compile with
include/video/vga.h: In function ‘vga_mm_r’:
include/video/vga.h:242: error: implicit declaration of function ‘z_readb’
include/video/vga.h: In function ‘vga_mm_w’:
include/video/vga.h:247: error: implicit declaration of function ‘z_writeb’
include/video/vga.h: In function ‘vga_mm_w_fast’:
include/video/vga.h:253: error: implicit declaration of function ‘z_writew’
or
include/video/vga.h:23:21: error: asm/vga.h: No such file or directory
depending on the value of CONFIG_AMIGA.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Diffstat (limited to 'include/video/vga.h')
| -rw-r--r-- | include/video/vga.h | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/include/video/vga.h b/include/video/vga.h index 2b8691f7d256..cac567f22e62 100644 --- a/include/video/vga.h +++ b/include/video/vga.h @@ -19,29 +19,7 @@ #include <linux/types.h> #include <asm/io.h> -#ifndef CONFIG_AMIGA #include <asm/vga.h> -#else -/* - * FIXME - * Ugh, we don't have PCI space, so map readb() and friends to use Zorro space - * for MMIO accesses. This should make cirrusfb work again on Amiga - */ -#undef inb_p -#undef inw_p -#undef outb_p -#undef outw -#undef readb -#undef writeb -#undef writew -#define inb_p(port) 0 -#define inw_p(port) 0 -#define outb_p(port, val) do { } while (0) -#define outw(port, val) do { } while (0) -#define readb z_readb -#define writeb z_writeb -#define writew z_writew -#endif #include <asm/byteorder.h> |