summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-08-09 21:07:26 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-08-09 21:07:26 +0000
commit4d5f7adac3687cbf4f6e4c5864cd03c42b684a52 (patch)
tree4026d1357bb7500131f56415a83b8d61e74e6afa /sys
parentc28606038bb9b435b42eafa83349f32806ba2a9f (diff)
Add a dummy <machine/conf.h> so that MI code can rely upon its existence.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sgi/include/conf.h3
-rw-r--r--sys/arch/sgi/sgi/conf.c11
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/arch/sgi/include/conf.h b/sys/arch/sgi/include/conf.h
new file mode 100644
index 00000000000..caf921e81f0
--- /dev/null
+++ b/sys/arch/sgi/include/conf.h
@@ -0,0 +1,3 @@
+/* $OpenBSD: conf.h,v 1.1 2009/08/09 21:07:22 miod Exp $ */
+/* public domain */
+#include <sys/conf.h>
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 798ae116e8e..aed7f4afb53 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.20 2009/06/03 18:32:24 jasper Exp $ */
+/* $OpenBSD: conf.c,v 1.21 2009/08/09 21:07:25 miod Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -43,7 +43,8 @@
#include <sys/proc.h>
#include <sys/vnode.h>
#include <sys/tty.h>
-#include <sys/conf.h>
+
+#include <machine/conf.h>
/*
* Block devices.
@@ -85,12 +86,6 @@ int nblkdev = sizeof (bdevsw) / sizeof (bdevsw[0]);
* Character devices.
*/
-/* open, close, write, ioctl */
-#define cdev_lpt_init(c,n) { \
- dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
- dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev }
-
#define mmread mmrw
#define mmwrite mmrw
dev_type_read(mmrw);