From e00dc329937f684b186f6c28eb1cc1ac45bbb962 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Mon, 14 Nov 1994 14:13:13 +0000
Subject: [PATCH] Remove extra idempotency ifdef and uniformize the other one.

Comment about support for 4 different spellings of KERNEL.
---
 sys/i386/include/soundcard.h | 15 ++++++---------
 sys/sys/soundcard.h          | 15 ++++++---------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/sys/i386/include/soundcard.h b/sys/i386/include/soundcard.h
index 67c6eeaca917..cd93d1139a02 100644
--- a/sys/i386/include/soundcard.h
+++ b/sys/i386/include/soundcard.h
@@ -1,8 +1,5 @@
-#ifndef SOUNDCARD_H
-#define SOUNDCARD_H
-
-#ifndef _I386_MACHINE_SOUNDCARD_H_
-#define _I386_MACHINE_SOUNDCARD_H_
+#ifndef _MACHINE_SOUNDCARD_H_
+#define	_MACHINE_SOUNDCARD_H_
 
 /*
  * Copyright by Hannu Savolainen 1993
@@ -28,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.h,v 1.8 1994/09/27 17:58:00 davidg Exp $
+ * $Id: soundcard.h,v 1.9 1994/10/01 02:32:23 swallace Exp $
  */
 
  /* 
@@ -955,6 +952,6 @@ void seqbuf_dump(void);	/* This function must be provided by programs */
 					   perror("Write patch: /dev/sequencer");}
 #define SEQ_WRPATCH2(patchx, len)	(seqbuf_dump(), write(seqfd, (char*)(patchx), len))
 
-#endif
-#endif
-#endif
+#endif /* !_KERNEL_SPAM */
+
+#endif /* !_MACHINE_SOUNDCARD_H_ */
diff --git a/sys/sys/soundcard.h b/sys/sys/soundcard.h
index 67c6eeaca917..cd93d1139a02 100644
--- a/sys/sys/soundcard.h
+++ b/sys/sys/soundcard.h
@@ -1,8 +1,5 @@
-#ifndef SOUNDCARD_H
-#define SOUNDCARD_H
-
-#ifndef _I386_MACHINE_SOUNDCARD_H_
-#define _I386_MACHINE_SOUNDCARD_H_
+#ifndef _MACHINE_SOUNDCARD_H_
+#define	_MACHINE_SOUNDCARD_H_
 
 /*
  * Copyright by Hannu Savolainen 1993
@@ -28,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: soundcard.h,v 1.8 1994/09/27 17:58:00 davidg Exp $
+ * $Id: soundcard.h,v 1.9 1994/10/01 02:32:23 swallace Exp $
  */
 
  /* 
@@ -955,6 +952,6 @@ void seqbuf_dump(void);	/* This function must be provided by programs */
 					   perror("Write patch: /dev/sequencer");}
 #define SEQ_WRPATCH2(patchx, len)	(seqbuf_dump(), write(seqfd, (char*)(patchx), len))
 
-#endif
-#endif
-#endif
+#endif /* !_KERNEL_SPAM */
+
+#endif /* !_MACHINE_SOUNDCARD_H_ */