From 3dc9f2bb59424d9e807e6728802ce1eaef5b7c90 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Fri, 15 Nov 1996 08:30:39 +0000
Subject: [PATCH] Rename sb.h to sb_defs.h and pas.h to pas_defs.h so there's
 no possibility of conflict with the versions in the compile dir.

---
 sys/i386/isa/sound/pas2_card.c           | 2 +-
 sys/i386/isa/sound/pas2_midi.c           | 2 +-
 sys/i386/isa/sound/pas2_mixer.c          | 2 +-
 sys/i386/isa/sound/pas2_pcm.c            | 2 +-
 sys/i386/isa/sound/{pas.h => pas_defs.h} | 0
 sys/i386/isa/sound/sb16_dsp.c            | 2 +-
 sys/i386/isa/sound/sb16_midi.c           | 2 +-
 sys/i386/isa/sound/{sb.h => sb_defs.h}   | 0
 sys/i386/isa/sound/sb_dsp.c              | 2 +-
 sys/i386/isa/sound/sb_midi.c             | 2 +-
 sys/i386/isa/sound/sb_mixer.c            | 2 +-
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename sys/i386/isa/sound/{pas.h => pas_defs.h} (100%)
 rename sys/i386/isa/sound/{sb.h => sb_defs.h} (100%)

diff --git a/sys/i386/isa/sound/pas2_card.c b/sys/i386/isa/sound/pas2_card.c
index eeff8ae2280..b6092615bb3 100644
--- a/sys/i386/isa/sound/pas2_card.c
+++ b/sys/i386/isa/sound/pas2_card.c
@@ -33,7 +33,7 @@
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS)
 
 #define DEFINE_TRANSLATIONS
-#include <i386/isa/sound/pas.h>
+#include <i386/isa/sound/pas_defs.h>
 
 static int config_pas_hw __P((struct address_info *hw_config));
 static int detect_pas_hw __P((struct address_info *hw_config));
diff --git a/sys/i386/isa/sound/pas2_midi.c b/sys/i386/isa/sound/pas2_midi.c
index a83158e44d4..ac4467b42ef 100644
--- a/sys/i386/isa/sound/pas2_midi.c
+++ b/sys/i386/isa/sound/pas2_midi.c
@@ -31,7 +31,7 @@
 
 #ifdef CONFIGURE_SOUNDCARD
 
-#include <i386/isa/sound/pas.h>
+#include <i386/isa/sound/pas_defs.h>
 
 #if !defined(EXCLUDE_PAS) && !defined(EXCLUDE_MIDI) && defined(EXCLUDE_PRO_MIDI)
 
diff --git a/sys/i386/isa/sound/pas2_mixer.c b/sys/i386/isa/sound/pas2_mixer.c
index c1ba76b7df5..53ae8ada07d 100644
--- a/sys/i386/isa/sound/pas2_mixer.c
+++ b/sys/i386/isa/sound/pas2_mixer.c
@@ -33,7 +33,7 @@
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_PAS)
 
-#include <i386/isa/sound/pas.h>
+#include <i386/isa/sound/pas_defs.h>
 
 extern void mix_write __P((unsigned char data, int ioaddr));
 static int pas_mixer_ioctl __P((int dev, unsigned int cmd, unsigned int arg));
diff --git a/sys/i386/isa/sound/pas2_pcm.c b/sys/i386/isa/sound/pas2_pcm.c
index 97ae76cf0fc..385ab1d22ca 100644
--- a/sys/i386/isa/sound/pas2_pcm.c
+++ b/sys/i386/isa/sound/pas2_pcm.c
@@ -32,7 +32,7 @@
 
 #ifdef CONFIGURE_SOUNDCARD
 
-#include <i386/isa/sound/pas.h>
+#include <i386/isa/sound/pas_defs.h>
 
 static int pcm_set_bits __P((int arg));
 static int pcm_set_channels __P((int arg));
diff --git a/sys/i386/isa/sound/pas.h b/sys/i386/isa/sound/pas_defs.h
similarity index 100%
rename from sys/i386/isa/sound/pas.h
rename to sys/i386/isa/sound/pas_defs.h
diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c
index 40577742516..5f6f3a66a56 100644
--- a/sys/i386/isa/sound/sb16_dsp.c
+++ b/sys/i386/isa/sound/sb16_dsp.c
@@ -35,7 +35,7 @@
  * #define DEB_DMARES
  */
 #include <i386/isa/sound/sound_config.h>
-#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_defs.h>
 #include <i386/isa/sound/sb_mixer.h>
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_AUDIO) && !defined(EXCLUDE_SBPRO)
diff --git a/sys/i386/isa/sound/sb16_midi.c b/sys/i386/isa/sound/sb16_midi.c
index 7dae7501124..308d234eaae 100644
--- a/sys/i386/isa/sound/sb16_midi.c
+++ b/sys/i386/isa/sound/sb16_midi.c
@@ -33,7 +33,7 @@
 
 #if !defined(EXCLUDE_SB) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_MIDI)
 
-#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_defs.h>
 
 #ifdef PC98
 #define	DATAPORT   (sb16midi_base)
diff --git a/sys/i386/isa/sound/sb.h b/sys/i386/isa/sound/sb_defs.h
similarity index 100%
rename from sys/i386/isa/sound/sb.h
rename to sys/i386/isa/sound/sb_defs.h
diff --git a/sys/i386/isa/sound/sb_dsp.c b/sys/i386/isa/sound/sb_dsp.c
index 82a2178317a..0d97d196466 100644
--- a/sys/i386/isa/sound/sb_dsp.c
+++ b/sys/i386/isa/sound/sb_dsp.c
@@ -37,7 +37,7 @@
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB)
 
-#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_defs.h>
 #include <i386/isa/sound/sb_mixer.h>
 #undef SB_TEST_IRQ
 
diff --git a/sys/i386/isa/sound/sb_midi.c b/sys/i386/isa/sound/sb_midi.c
index de661ac3590..96fdcb99887 100644
--- a/sys/i386/isa/sound/sb_midi.c
+++ b/sys/i386/isa/sound/sb_midi.c
@@ -31,7 +31,7 @@
 
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_MIDI)
 
-#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_defs.h>
 #undef SB_TEST_IRQ
 
 /*
diff --git a/sys/i386/isa/sound/sb_mixer.c b/sys/i386/isa/sound/sb_mixer.c
index 4fd2db20a2f..dc34c09b497 100644
--- a/sys/i386/isa/sound/sb_mixer.c
+++ b/sys/i386/isa/sound/sb_mixer.c
@@ -37,7 +37,7 @@
 #if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_SB) && !defined(EXCLUDE_SBPRO)
 #define __SB_MIXER_C__
 
-#include <i386/isa/sound/sb.h>
+#include <i386/isa/sound/sb_defs.h>
 #include <i386/isa/sound/sb_mixer.h>
 #undef SB_TEST_IRQ