From 890931c9ebaec71f11621ec91de8ef00d8a20eac Mon Sep 17 00:00:00 2001
From: mickey <mickey@openbsd.org>
Date: Sat, 4 May 1996 18:50:28 +0000
Subject: [PATCH] remove #ifndef LKM, since that stuff already in sys/conf.h,
 add lkmenodev prototype.

---
 sys/arch/alpha/alpha/conf.c     |  6 ------
 sys/arch/arm32/arm32/conf.c     |  6 ------
 sys/arch/atari/atari/conf.c     |  8 +-------
 sys/arch/hp300/hp300/conf.c     |  6 ------
 sys/arch/i386/i386/conf.c       | 13 +------------
 sys/arch/mac68k/mac68k/conf.c   |  8 +-------
 sys/arch/mvme68k/mvme68k/conf.c |  8 +-------
 sys/arch/mvme88k/mvme88k/conf.c |  6 ------
 sys/arch/sparc/sparc/conf.c     |  8 +-------
 sys/arch/vax/vax/conf.c         |  9 ---------
 sys/sys/conf.h                  |  3 ++-
 11 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/sys/arch/alpha/alpha/conf.c b/sys/arch/alpha/alpha/conf.c
index 6a6b2e0ad04..144cb4b712a 100644
--- a/sys/arch/alpha/alpha/conf.c
+++ b/sys/arch/alpha/alpha/conf.c
@@ -45,12 +45,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-#ifndef LKM
-#define	lkmenodev	enodev
-#else
-int	lkmenodev();
-#endif
-
 bdev_decl(sw);
 #include "st.h"
 bdev_decl(st);
diff --git a/sys/arch/arm32/arm32/conf.c b/sys/arch/arm32/arm32/conf.c
index 8262efdfbc4..6da8418cc10 100644
--- a/sys/arch/arm32/arm32/conf.c
+++ b/sys/arch/arm32/arm32/conf.c
@@ -56,12 +56,6 @@
 
 int     ttselect        __P((dev_t, int, struct proc *));
 
-#ifndef LKM
-#define lkmenodev       enodev
-#else
-int     lkmenodev();
-#endif
-
 #include "wdc.h"
 bdev_decl(wd);
 bdev_decl(sw);
diff --git a/sys/arch/atari/atari/conf.c b/sys/arch/atari/atari/conf.c
index 85b2c5287ba..3d56515d17a 100644
--- a/sys/arch/atari/atari/conf.c
+++ b/sys/arch/atari/atari/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.4 1996/02/21 12:53:42 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.5 1996/05/04 18:50:37 mickey Exp $	*/
 
 /*
  * Copyright (c) 1991 The Regents of the University of California.
@@ -50,12 +50,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-#ifndef LKM
-#define	lkmenodev	enodev
-#else
-int	lkmenodev();
-#endif
-
 #define	bdev_rd_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,strategy), \
 	dev_init(c,n,ioctl), (dev_type_dump((*))) enxio, dev_size_init(c,n), 0 }
diff --git a/sys/arch/hp300/hp300/conf.c b/sys/arch/hp300/hp300/conf.c
index 3465cf0ba27..162a4d46c84 100644
--- a/sys/arch/hp300/hp300/conf.c
+++ b/sys/arch/hp300/hp300/conf.c
@@ -45,12 +45,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-#ifndef LKM
-#define	lkmenodev	enodev
-#else
-int	lkmenodev();
-#endif
-
 #include "ct.h"
 bdev_decl(ct);
 #include "mt.h"
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 9b68b21902b..c28ad9cc561 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.13 1996/04/29 14:12:41 hvozda Exp $	*/
+/*	$OpenBSD: conf.c,v 1.14 1996/05/04 18:50:44 mickey Exp $	*/
 /*	$NetBSD: conf.c,v 1.74 1996/03/30 07:30:33 mycroft Exp $	*/
 
 /*
@@ -40,12 +40,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-#ifndef LKM
-#define	lkmenodev	enodev
-#else
-int	lkmenodev();
-#endif
-
 #include "wdc.h"
 bdev_decl(wd);
 bdev_decl(sw);
@@ -172,11 +166,6 @@ cdev_decl(bpf);
 cdev_decl(pcmcia);
 #include "spkr.h"
 cdev_decl(spkr);
-#ifdef LKM
-#define	NLKM	1
-#else
-#define	NLKM	0
-#endif
 cdev_decl(lkm);
 #include "mms.h"
 cdev_decl(mms);
diff --git a/sys/arch/mac68k/mac68k/conf.c b/sys/arch/mac68k/mac68k/conf.c
index 6dacefeefb4..7279072c47a 100644
--- a/sys/arch/mac68k/mac68k/conf.c
+++ b/sys/arch/mac68k/mac68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.4 1996/02/21 12:53:47 mickey Exp $	*/
+/*	$OpenBSD: conf.c,v 1.5 1996/05/04 18:50:46 mickey Exp $	*/
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -98,12 +98,6 @@ bdev_decl(ccd);
 bdev_decl(rd);
 /* No cdev for rd */
 
-#ifdef LKM
-int	lkmenodev();
-#else
-#define lkmenodev	enodev
-#endif
-
 struct bdevsw	bdevsw[] =
 {
 	bdev_notdef(),         		/* 0 */
diff --git a/sys/arch/mvme68k/mvme68k/conf.c b/sys/arch/mvme68k/mvme68k/conf.c
index 53ecb20bdc0..63504f84e92 100644
--- a/sys/arch/mvme68k/mvme68k/conf.c
+++ b/sys/arch/mvme68k/mvme68k/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.5 1996/04/28 10:58:09 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.6 1996/05/04 18:50:49 mickey Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
@@ -90,12 +90,6 @@ bdev_decl(vnd);
 #include "ccd.h"
 bdev_decl(ccd);
 
-#ifdef LKM
-int	lkmenodev();
-#else
-#define	lkmenodev	enodev
-#endif
-
 struct bdevsw	bdevsw[] =
 {
 	bdev_notdef(),			/* 0 */
diff --git a/sys/arch/mvme88k/mvme88k/conf.c b/sys/arch/mvme88k/mvme88k/conf.c
index ac48d0a62e6..d1d2e47c7bb 100644
--- a/sys/arch/mvme88k/mvme88k/conf.c
+++ b/sys/arch/mvme88k/mvme88k/conf.c
@@ -63,12 +63,6 @@ bdev_decl(xd);
 #include "vnd.h"
 bdev_decl(vnd);
 
-#ifdef LKM
-int	lkmenodev();
-#else
-#define	lkmenodev	enodev
-#endif
-
 struct bdevsw	bdevsw[] =
 {
 	bdev_notdef(),			/* 0 */
diff --git a/sys/arch/sparc/sparc/conf.c b/sys/arch/sparc/sparc/conf.c
index b603c1127db..a35469ec6b9 100644
--- a/sys/arch/sparc/sparc/conf.c
+++ b/sys/arch/sparc/sparc/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.4 1996/02/21 12:53:53 mickey Exp $ */
+/*	$OpenBSD: conf.c,v 1.5 1996/05/04 18:50:55 mickey Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -54,12 +54,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-#ifdef LKM
-int	lkmenodev();
-#else
-#define	lkmenodev	enodev
-#endif
-
 bdev_decl(sw);
 #include "sd.h"
 bdev_decl(sd);
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index ce5e911fb86..467f5c05132 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -45,10 +45,6 @@
 
 int	ttselect	__P((dev_t, int, struct proc *));
 
-#ifndef LKM
-#define lkmenodev       enodev
-#endif
-
 #include "hp.h" /* 0 */
 bdev_decl(hp);
 
@@ -203,11 +199,6 @@ cdev_decl(pts);
 #define	ptcioctl	ptyioctl
 cdev_decl(ptc);
 cdev_decl(log);
-#ifdef LKM
-#define	NLKM	1
-#else
-#define	NLKM	0
-#endif
 cdev_decl(lkm);
 
 cdev_decl(hp);
diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index 603e1b8c1f5..21ba2eba41f 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.h,v 1.7 1996/04/21 22:31:34 deraadt Exp $	*/
+/*	$OpenBSD: conf.h,v 1.8 1996/05/04 18:51:02 mickey Exp $	*/
 /*	$NetBSD: conf.h,v 1.32 1996/03/30 21:52:04 christos Exp $	*/
 
 /*-
@@ -367,6 +367,7 @@ cdev_decl(log);
 # define	lkmenodev	enodev
 #else
 # define	NLKM	1
+int	lkmenodev();
 #endif
 cdev_decl(lkm);
 
-- 
2.20.1