summaryrefslogtreecommitdiff
path: root/sys/arch/alpha/include/fbio.h
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-30 22:41:57 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1996-10-30 22:41:57 +0000
commit072b56c97e17e8e69ddab5a735b5297387a88a70 (patch)
tree22eaee09956502609c240ddff8a108d8733521f9 /sys/arch/alpha/include/fbio.h
parentb85b15782739220b5bf2563ccdc7ac9e256a31d2 (diff)
Merge to NetBSD 961020. Retained our kernel APIs where NetBSD has changed.
-Wall -Wstrict-prototypes -Wmissing-prototypes too.
Diffstat (limited to 'sys/arch/alpha/include/fbio.h')
-rw-r--r--sys/arch/alpha/include/fbio.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/alpha/include/fbio.h b/sys/arch/alpha/include/fbio.h
index a9a4c40eae2..bce6db8ba24 100644
--- a/sys/arch/alpha/include/fbio.h
+++ b/sys/arch/alpha/include/fbio.h
@@ -1,5 +1,5 @@
-/* $OpenBSD: fbio.h,v 1.2 1996/07/29 22:58:43 niklas Exp $ */
-/* $NetBSD: fbio.h,v 1.2 1996/05/01 19:44:21 cgd Exp $ */
+/* $OpenBSD: fbio.h,v 1.3 1996/10/30 22:39:04 niklas Exp $ */
+/* $NetBSD: fbio.h,v 1.3 1996/08/23 00:50:25 cgd Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -57,8 +57,9 @@
#define FBTYPE_PCIVGA 7 /* PCI VGA */
#define FBTYPE_TGA 8 /* TGA (PCI) */
#define FBTYPE_SFBP 9 /* SFB+ (TurboChannel) */
+#define FBTYPE_TGA2 10 /* TGA2 (PCI) */
-#define FBTYPE_LASTPLUSONE 10
+#define FBTYPE_LASTPLUSONE 11
/*
* Frame buffer descriptor as returned by FBIOGTYPE.