From owner-p4-projects@FreeBSD.ORG  Tue Feb  5 03:13:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E935416A41B; Tue,  5 Feb 2008 03:13:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AEAC216A419
	for <perforce@freebsd.org>; Tue,  5 Feb 2008 03:13:29 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F28913C447
	for <perforce@freebsd.org>; Tue,  5 Feb 2008 03:13:29 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m153DT3g079813
	for <perforce@freebsd.org>; Tue, 5 Feb 2008 03:13:29 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m153DT0Q079810
	for perforce@freebsd.org; Tue, 5 Feb 2008 03:13:29 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 5 Feb 2008 03:13:29 GMT
Message-Id: <200802050313.m153DT0Q079810@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134813 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Feb 2008 03:13:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=134813

Change 134813 by kmacy@pandemonium:kmacy:xen31 on 2008/02/05 03:13:12

	make sound build

Affected files ...

.. //depot/projects/xen31/sys/dev/sound/pcm/sound.h#2 edit

Differences ...

==== //depot/projects/xen31/sys/dev/sound/pcm/sound.h#2 (text+ko) ====

@@ -31,12 +31,13 @@
  * first, include kernel header files.
  */
 
-#ifndef _OS_H_
-#define _OS_H_
+#ifndef _SOUND_IS_A_PAIN_IN_MY_ASS_H_
+#define _SOUND_IS_A_PAIN_IN_MY_ASS_H_
 
 #ifdef _KERNEL
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/module.h>
 #include <sys/ioccom.h>
 #include <sys/filio.h>
 #include <sys/sockio.h>
@@ -545,17 +546,14 @@
 int sndstat_unregister(device_t dev);
 int sndstat_unregisterfile(char *str);
 
-#define SND_DECLARE_FILE(version) \
-	_SND_DECLARE_FILE(__LINE__, version)
-
-#define _SND_DECLARE_FILE(uniq, version) \
-	__SND_DECLARE_FILE(uniq, version)
-
 #define __SND_DECLARE_FILE(uniq, version) \
-	static char sndstat_vinfo[] = version; \
+	static char sndstat_vinfo[] = version;			\
 	SYSINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_registerfile, sndstat_vinfo); \
 	SYSUNINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_unregisterfile, sndstat_vinfo);
 
+#define SND_DECLARE_FILE(version) \
+	__SND_DECLARE_FILE(__LINE__, (version))
+
 /* usage of flags in device config entry (config file) */
 #define DV_F_DRQ_MASK	0x00000007	/* mask for secondary drq */
 #define	DV_F_DUAL_DMA	0x00000010	/* set to use secondary dma channel */