summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorYoshihiro Takahashi <nyan@FreeBSD.org>2000-03-19 08:05:54 +0000
committerYoshihiro Takahashi <nyan@FreeBSD.org>2000-03-19 08:05:54 +0000
commit0cdc0996dfcfdd52bed0c4f19ff00ff1f79078f7 (patch)
tree216919c81259b69933cf4315ada5ef3bb873bc67 /sys
parent9d0f3ec93fcf03bec6000c915bd21061202681f0 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/pc98/pc98/olpt.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/sys/pc98/pc98/olpt.c b/sys/pc98/pc98/olpt.c
index 19846345799c..33ec58cabd01 100644
--- a/sys/pc98/pc98/olpt.c
+++ b/sys/pc98/pc98/olpt.c
@@ -106,6 +106,7 @@
#include "opt_inet.h"
#ifdef PC98
#undef INET /* PLIP is not supported for old PC-98 */
+#define LPT_DRVINIT_AT_ATTACH /* avoid conflicting with lpt on ppbus */
#endif
#include <sys/param.h>
@@ -276,6 +277,7 @@ static timeout_t lptout;
static int lptprobe (struct isa_device *dvp);
static int lptattach (struct isa_device *isdp);
static ointhand2_t lptintr;
+static void lpt_drvinit(void *unused);
#ifdef INET
@@ -498,6 +500,9 @@ lptattach(struct isa_device *isdp)
unit | LP_BYPASS, DV_CHR,
UID_ROOT, GID_WHEEL, 0600, "lpctl%d", unit);
#endif
+#ifdef LPT_DRVINIT_AT_ATTACH
+ lpt_drvinit(NULL);
+#endif
return (1);
}
@@ -1437,6 +1442,6 @@ static void lpt_drvinit(void *unused)
lpt_devsw_installed = 1;
}
}
-
+#ifndef LPT_DRVINIT_AT_ATTACH
SYSINIT(lptdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,lpt_drvinit,NULL)
-
+#endif