From fd8ccecd98f14feda0255219664a391a3f903e88 Mon Sep 17 00:00:00 2001
From: ratchov <ratchov@openbsd.org>
Date: Tue, 12 May 2015 16:35:23 +0000
Subject: [PATCH] Remove references to (deleted) auconv.h and mulaw.h files.
 Fixes i386 build. Found by Mark Patruck <mark at wrapped.cx>, thanks!

---
 sys/dev/isa/gus_isa.c    | 4 +---
 sys/dev/isa/gus_isapnp.c | 4 +---
 sys/dev/isa/sb_isa.c     | 3 +--
 sys/dev/isa/sb_isapnp.c  | 3 +--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/sys/dev/isa/gus_isa.c b/sys/dev/isa/gus_isa.c
index 6da7f083a4e..7aec5616f08 100644
--- a/sys/dev/isa/gus_isa.c
+++ b/sys/dev/isa/gus_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus_isa.c,v 1.6 2014/09/14 14:17:25 jsg Exp $	*/
+/*	$OpenBSD: gus_isa.c,v 1.7 2015/05/12 16:35:23 ratchov Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -106,8 +106,6 @@
 #include <machine/cpufunc.h>
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
-#include <dev/mulaw.h>
-#include <dev/auconv.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/gus_isapnp.c b/sys/dev/isa/gus_isapnp.c
index 0aa3f15be33..9e92c7472c3 100644
--- a/sys/dev/isa/gus_isapnp.c
+++ b/sys/dev/isa/gus_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus_isapnp.c,v 1.7 2014/09/14 14:17:25 jsg Exp $	*/
+/*	$OpenBSD: gus_isapnp.c,v 1.8 2015/05/12 16:35:23 ratchov Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -106,8 +106,6 @@
 #include <machine/cpufunc.h>
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
-#include <dev/mulaw.h>
-#include <dev/auconv.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/sb_isa.c b/sys/dev/isa/sb_isa.c
index d2879a4a34b..6615322ca18 100644
--- a/sys/dev/isa/sb_isa.c
+++ b/sys/dev/isa/sb_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb_isa.c,v 1.9 2014/09/14 14:17:25 jsg Exp $	*/
+/*	$OpenBSD: sb_isa.c,v 1.10 2015/05/12 16:35:23 ratchov Exp $	*/
 /*	$NetBSD: sb_isa.c,v 1.15 1997/11/30 15:32:25 drochner Exp $	*/
 
 /*
@@ -47,7 +47,6 @@
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
 #include <dev/midi_if.h>
-#include <dev/mulaw.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmavar.h>
diff --git a/sys/dev/isa/sb_isapnp.c b/sys/dev/isa/sb_isapnp.c
index 06c3fbfdd46..ec07cb5143e 100644
--- a/sys/dev/isa/sb_isapnp.c
+++ b/sys/dev/isa/sb_isapnp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sb_isapnp.c,v 1.14 2014/09/14 14:17:25 jsg Exp $	*/
+/*	$OpenBSD: sb_isapnp.c,v 1.15 2015/05/12 16:35:23 ratchov Exp $	*/
 /*	$NetBSD: sb_isa.c,v 1.3 1997/03/20 11:03:11 mycroft Exp $	*/
 
 /*
@@ -45,7 +45,6 @@
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
 #include <dev/midi_if.h>
-#include <dev/mulaw.h>
 
 #include <dev/isa/isavar.h>
 #include <dev/isa/isadmavar.h>
-- 
2.20.1