summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/include/conf.h
diff options
context:
space:
mode:
authorJason Downs <downsj@cvs.openbsd.org>1997-08-08 08:27:49 +0000
committerJason Downs <downsj@cvs.openbsd.org>1997-08-08 08:27:49 +0000
commitc6af50ae96c114059441edde31a2879102e32d99 (patch)
treee77d44cd72b4d881fb3461d76bdd50f77adc0966 /sys/arch/sparc/include/conf.h
parentc1492b0f5209b759b0ab6624db56b310c28e48e2 (diff)
Mostly sync to NetBSD-current 970804.
GENERIC currently compiles and runs; some devices (isp) are not complete and not yet enabled.
Diffstat (limited to 'sys/arch/sparc/include/conf.h')
-rw-r--r--sys/arch/sparc/include/conf.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/arch/sparc/include/conf.h b/sys/arch/sparc/include/conf.h
index 20855735e69..cedfec5cc9b 100644
--- a/sys/arch/sparc/include/conf.h
+++ b/sys/arch/sparc/include/conf.h
@@ -1,5 +1,5 @@
-/* $NetBSD: conf.h,v 1.1 1996/03/30 21:17:55 christos Exp $ */
-/* $OpenBSD: conf.h,v 1.4 1997/05/06 19:07:36 kstailey Exp $ */
+/* $OpenBSD: conf.h,v 1.5 1997/08/08 08:26:10 downsj Exp $ */
+/* $NetBSD: conf.h,v 1.8 1996/12/31 07:12:43 mrg Exp $ */
/*
* Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -62,6 +62,8 @@ cdev_decl(kbd);
cdev_decl(bwtwo);
+cdev_decl(cgtwo);
+
cdev_decl(cgthree);
cdev_decl(cgfour);
@@ -70,6 +72,10 @@ cdev_decl(cgsix);
cdev_decl(cgeight);
+cdev_decl(tcx);
+
+cdev_decl(cgfourteen);
+
cdev_decl(ipl);
#ifdef IPFILTER
#define NIPF 1
@@ -85,3 +91,6 @@ cdev_decl(xy);
bdev_decl(sw);
cdev_decl(sw);
+
+bdev_decl(rd);
+cdev_decl(rd);