PERFORCE change 134813 for review

[Kip Macy]

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

Change 134813 by kmacy at 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 */