From 2c46e1df9de7d1c2ae5018afc0bbd9e4da9cf1e8 Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Tue, 1 Feb 2000 08:54:14 +0000
Subject: [PATCH] Synced with sys/i386/isa/mse.c, npx.c and spkr.c revisions
 1.49, 1.80 and 1.45, respectively.

Approved by:	jkh
---
 sys/pc98/pc98/mse.c  | 3 ---
 sys/pc98/pc98/npx.c  | 5 -----
 sys/pc98/pc98/spkr.c | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/sys/pc98/pc98/mse.c b/sys/pc98/pc98/mse.c
index c8d0d941b38c..5b8f20c37438 100644
--- a/sys/pc98/pc98/mse.c
+++ b/sys/pc98/pc98/mse.c
@@ -45,8 +45,6 @@
  */
 
 #include "mse.h"
-#if NMSE > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -923,4 +921,3 @@ mse_get98m(port, dx, dy, but)
 }
 #endif
 
-#endif /* NMSE */
diff --git a/sys/pc98/pc98/npx.c b/sys/pc98/pc98/npx.c
index 3a7f592f1361..10184cf4cd78 100644
--- a/sys/pc98/pc98/npx.c
+++ b/sys/pc98/pc98/npx.c
@@ -35,9 +35,6 @@
  * $FreeBSD$
  */
 
-#include "npx.h"
-#if NNPX > 0
-
 #include "opt_debug_npx.h"
 #include "opt_math_emulate.h"
 #include "opt_npx.h"
@@ -1006,5 +1003,3 @@ static devclass_t npx_devclass;
  * doesn't describe the processor as being `on isa'.
  */
 DRIVER_MODULE(npx, nexus, npx_driver, npx_devclass, 0, 0);
-
-#endif /* NNPX > 0 */
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 56453b818d1b..6ac7c2fc4a31 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -11,10 +11,6 @@
  * modified for PC98 by Kakefuda
  */
 
-#include "speaker.h"
-
-#if NSPEAKER > 0
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -630,5 +626,4 @@ spkr_drvinit(void *unused)
 SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL)
 
 
-#endif  /* NSPEAKER > 0 */
 /* spkr.c ends here */