diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/mpuvar.h (renamed from sys/dev/isa/mpu401var.h) | 2 | ||||
| -rw-r--r-- | sys/dev/isa/mpu401.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/mpu_isapnp.c | 2 | ||||
| -rw-r--r-- | sys/dev/isa/sbdspvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/isa/ym.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/ym_isapnp.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/eso.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/opl_eso.c | 8 |
8 files changed, 13 insertions, 21 deletions
diff --git a/sys/dev/isa/mpu401var.h b/sys/dev/ic/mpuvar.h index 97ea3041168..45d931f2108 100644 --- a/sys/dev/isa/mpu401var.h +++ b/sys/dev/ic/mpuvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu401var.h,v 1.2 1999/07/20 16:36:05 deraadt Exp $ */ +/* $OpenBSD: mpuvar.h,v 1.1 1999/08/05 05:32:40 deraadt Exp $ */ /* $NetBSD: mpu401var.h,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* diff --git a/sys/dev/isa/mpu401.c b/sys/dev/isa/mpu401.c index 225a7a113a5..ac09dc28aad 100644 --- a/sys/dev/isa/mpu401.c +++ b/sys/dev/isa/mpu401.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpu401.c,v 1.3 1999/07/23 13:18:04 niklas Exp $ */ +/* $OpenBSD: mpu401.c,v 1.4 1999/08/05 05:32:40 deraadt Exp $ */ /* $NetBSD: mpu401.c,v 1.3 1998/11/25 22:17:06 augustss Exp $ */ /* @@ -56,7 +56,7 @@ #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #ifndef splaudio #define splaudio() splbio() /* XXX found in audio_if.h normally */ diff --git a/sys/dev/isa/mpu_isapnp.c b/sys/dev/isa/mpu_isapnp.c index 7814e27195b..93f258a2ee0 100644 --- a/sys/dev/isa/mpu_isapnp.c +++ b/sys/dev/isa/mpu_isapnp.c @@ -18,7 +18,7 @@ #include <dev/isa/isavar.h> #include <dev/isa/isadmavar.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> int mpu_isapnp_match __P((struct device *, void *, void *)); void mpu_isapnp_attach __P((struct device *, struct device *, void *)); diff --git a/sys/dev/isa/sbdspvar.h b/sys/dev/isa/sbdspvar.h index bad0ef19d60..d5cf4dcb1fb 100644 --- a/sys/dev/isa/sbdspvar.h +++ b/sys/dev/isa/sbdspvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbdspvar.h,v 1.10 1999/07/20 16:36:05 deraadt Exp $ */ +/* $OpenBSD: sbdspvar.h,v 1.11 1999/08/05 05:32:41 deraadt Exp $ */ /* $NetBSD: sbdspvar.h,v 1.37 1998/08/10 00:20:39 mycroft Exp $ */ /* @@ -37,7 +37,7 @@ #include "midi.h" #if NMIDI > 0 -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #endif #define SB_MASTER_VOL 0 diff --git a/sys/dev/isa/ym.c b/sys/dev/isa/ym.c index ea4b11a68f9..3e39bba2911 100644 --- a/sys/dev/isa/ym.c +++ b/sys/dev/isa/ym.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym.c,v 1.7 1999/07/21 16:19:55 provos Exp $ */ +/* $OpenBSD: ym.c,v 1.8 1999/08/05 05:32:41 deraadt Exp $ */ /* @@ -52,7 +52,7 @@ #include <dev/ic/ad1848reg.h> #include <dev/isa/ad1848var.h> #include <dev/ic/opl3sa3.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #include <dev/isa/ymvar.h> int ym_getdev __P((void *, struct audio_device *)); diff --git a/sys/dev/isa/ym_isapnp.c b/sys/dev/isa/ym_isapnp.c index d5cb93bd9f9..90d49707ac3 100644 --- a/sys/dev/isa/ym_isapnp.c +++ b/sys/dev/isa/ym_isapnp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ym_isapnp.c,v 1.6 1999/07/21 12:39:22 deraadt Exp $ */ +/* $OpenBSD: ym_isapnp.c,v 1.7 1999/08/05 05:32:41 deraadt Exp $ */ /* @@ -54,7 +54,7 @@ #include <dev/ic/cs4231reg.h> #include <dev/isa/cs4231var.h> -#include <dev/isa/mpu401var.h> +#include <dev/ic/mpuvar.h> #include <dev/isa/wssreg.h> #include <dev/isa/ymvar.h> diff --git a/sys/dev/pci/eso.c b/sys/dev/pci/eso.c index d1f2cd4bf55..8d49f3cd025 100644 --- a/sys/dev/pci/eso.c +++ b/sys/dev/pci/eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: eso.c,v 1.1 1999/08/04 23:38:03 niklas Exp $ */ +/* $OpenBSD: eso.c,v 1.2 1999/08/05 05:32:41 deraadt Exp $ */ /* $NetBSD: eso.c,v 1.3 1999/08/02 17:37:43 augustss Exp $ */ /* @@ -58,11 +58,7 @@ #include <dev/mulaw.h> #include <dev/auconv.h> -#ifdef __OpenBSD__ -#include <dev/isa/mpu401var.h> /* XXX should not be ISA! */ -#else #include <dev/ic/mpuvar.h> -#endif #include <dev/ic/i8237reg.h> #include <dev/pci/esoreg.h> #include <dev/pci/esovar.h> diff --git a/sys/dev/pci/opl_eso.c b/sys/dev/pci/opl_eso.c index 27921e5338e..1cc612b3c34 100644 --- a/sys/dev/pci/opl_eso.c +++ b/sys/dev/pci/opl_eso.c @@ -1,4 +1,4 @@ -/* $OpenBSD: opl_eso.c,v 1.1 1999/08/04 23:38:03 niklas Exp $ */ +/* $OpenBSD: opl_eso.c,v 1.2 1999/08/05 05:32:41 deraadt Exp $ */ /* $NetBSD: opl_eso.c,v 1.1 1999/07/12 15:13:31 kleink Exp $ */ /* @@ -67,11 +67,7 @@ #include <dev/pci/pcireg.h> #include <dev/pci/pcivar.h> -#ifdef __OpenBSD__ -#include <dev/isa/mpu401var.h> /* XXX should not be ISA! */ -#else -#include <dev/isa/mpuvar.h> /* XXX should not be ISA! */ -#endif +#include <dev/ic/mpuvar.h> #include <dev/pci/esovar.h> HIDE int opl_eso_match __P((struct device *, MATCH_ARG_2_T, void *)); |