diff options
| author | David Eger <eger@havoc.gtf.org> | 2004-07-28 09:09:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-28 09:09:36 -0700 |
| commit | d190c5ba81a998317fef0c9643fe1f9a0016ca63 (patch) | |
| tree | 89179c236ef1a8ef770689c0ef2c96e50e08d6d9 /include | |
| parent | d9dfcd12a6566226aa1611d2ad4eb5375069c7bd (diff) | |
[PATCH] cirrusfb: update for amiga (zorro)
Cirrusfb updates:
- Cirrusfb depends on Zorro or PCI
- Revive Zorro support, using new Zorro driver framework
- Merge PCI and Zorro code where possible
- Use C99 initializers
- Kill superfluous whitespace
- #undef I/O ops before redefining them on Amiga
From: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: David Eger <eger@havoc.gtf.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/video/vga.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/video/vga.h b/include/video/vga.h index 480c58417beb..e44593d3cd93 100644 --- a/include/video/vga.h +++ b/include/video/vga.h @@ -26,8 +26,15 @@ /* * FIXME * Ugh, we don't have PCI space, so map readb() and friends to use Zorro space - * for MMIO accesses. This should make clgenfb work again on Amiga + * 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) |