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

@@ -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 */

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 */

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 */