[Midnightbsd-cvs] src: sound/driver: merge

[laffer1 at midnightbsd.org]

Log Message:
-----------
merge

Modified Files:
--------------
    src/sys/modules/sound/driver:
        Makefile (r1.2 -> r1.3)
    src/sys/modules/sound/driver/atiixp:
        Makefile (r1.2 -> r1.3)
    src/sys/modules/sound/driver/cmi:
        Makefile (r1.2 -> r1.3)
    src/sys/modules/sound/driver/emu10k1:
        Makefile (r1.2 -> r1.3)
    src/sys/modules/sound/driver/ess:
        Makefile (r1.2 -> r1.3)
    src/sys/modules/sound/driver/hda:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/sound/driver/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/modules/sound/driver/Makefile -L sys/modules/sound/driver/Makefile -u -r1.2 -r1.3
--- sys/modules/sound/driver/Makefile
+++ sys/modules/sound/driver/Makefile
@@ -1,12 +1,11 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.16.2.1 2005/12/30 19:55:54 netchild Exp $
+# $FreeBSD: src/sys/modules/sound/driver/Makefile,v 1.24 2006/10/01 11:18:56 ariff Exp $
 
 .if ${MACHINE_ARCH} == "sparc64"
 SUBDIR  = audiocs es137x
 .else
-SUBDIR  = als4000 ad1816 atiixp cmi cs4281 csa ds1 emu10k1 es137x ess
-SUBDIR += fm801 hda ich maestro maestro3 mss neomagic sb16 sb8 sbc solo
-SUBDIR += t4dwave via8233 via82c686 vibes
+SUBDIR  = ad1816 als4000 atiixp cmi cs4281 csa ds1 emu10k1 emu10kx envy24
+SUBDIR += envy24ht es137x ess fm801 hda ich maestro maestro3 mss neomagic
+SUBDIR += sb16 sb8 sbc solo spicds t4dwave via8233 via82c686 vibes
 SUBDIR += driver uaudio
 .endif
 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/sound/driver/atiixp/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/modules/sound/driver/atiixp/Makefile -L sys/modules/sound/driver/atiixp/Makefile -u -r1.2 -r1.3
--- sys/modules/sound/driver/atiixp/Makefile
+++ sys/modules/sound/driver/atiixp/Makefile
@@ -1,5 +1,4 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/atiixp/Makefile,v 1.1.2.1 2005/12/30 19:55:55 netchild Exp $
+# $FreeBSD: src/sys/modules/sound/driver/atiixp/Makefile,v 1.1 2005/11/27 03:29:59 ariff Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/sound/driver/cmi/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/modules/sound/driver/cmi/Makefile -L sys/modules/sound/driver/cmi/Makefile -u -r1.2 -r1.3
--- sys/modules/sound/driver/cmi/Makefile
+++ sys/modules/sound/driver/cmi/Makefile
@@ -1,10 +1,10 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/cmi/Makefile,v 1.3 2003/02/07 13:56:31 nyan Exp $
+# $FreeBSD: src/sys/modules/sound/driver/cmi/Makefile,v 1.4 2006/05/27 16:32:04 netchild Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci
 
 KMOD=	snd_cmi
 SRCS=	device_if.h bus_if.h pci_if.h
+SRCS+= mpufoi_if.h
 SRCS+=	cmi.c
 
 .include <bsd.kmod.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/sound/driver/emu10k1/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/modules/sound/driver/emu10k1/Makefile -L sys/modules/sound/driver/emu10k1/Makefile -u -r1.2 -r1.3
--- sys/modules/sound/driver/emu10k1/Makefile
+++ sys/modules/sound/driver/emu10k1/Makefile
@@ -1,15 +1,19 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/emu10k1/Makefile,v 1.4 2004/01/11 10:30:56 obrien Exp $
+# $FreeBSD: src/sys/modules/sound/driver/emu10k1/Makefile,v 1.5 2006/05/27 16:32:04 netchild Exp $
 
-.PATH: ${.CURDIR}/../../../../dev/sound/pci        ${.CURDIR}/../../../../gnu/dev/sound/pci
+.PATH: ${.CURDIR}/../../../../dev/sound/pci \
+       ${.CURDIR}/../../../../gnu/dev/sound/pci
 
 KMOD=	snd_emu10k1
 SRCS=	device_if.h bus_if.h pci_if.h emu10k1-alsa%diked.h
+SRCS+= mpufoi_if.h
 SRCS+=	emu10k1.c
 
 CLEANFILES+= emu10k1-alsa%diked.h
 
 emu10k1-alsa%diked.h: emu10k1-alsa.h
-	grep -v '#include' ${.OODATE} | $(CC) -E -D__KERNEL__ -dM - 	    | awk -F"[ 	(]" '/define/ 	    { print "#ifndef " $$2 ; print ; print "#endif" }' 	    >${.TARGET}
+	grep -v '#include' ${.OODATE} | $(CC) -E -D__KERNEL__ -dM - \
+	    | awk -F"[ 	(]" '/define/ \
+	    { print "#ifndef " $$2 ; print ; print "#endif" }' \
+	    >${.TARGET}
 
 .include <bsd.kmod.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/sound/driver/ess/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/modules/sound/driver/ess/Makefile -L sys/modules/sound/driver/ess/Makefile -u -r1.2 -r1.3
--- sys/modules/sound/driver/ess/Makefile
+++ sys/modules/sound/driver/ess/Makefile
@@ -1,10 +1,9 @@
-# $MidnightBSD$
-# $FreeBSD: src/sys/modules/sound/driver/ess/Makefile,v 1.3 2002/01/23 03:32:36 cg Exp $
+# $FreeBSD: src/sys/modules/sound/driver/ess/Makefile,v 1.4 2006/05/12 18:05:35 ariff Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/isa
 
 KMOD=	snd_ess
 SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
-SRCS+=	ess.c es1888.c
+SRCS+=	ess.c
 
 .include <bsd.kmod.mk>
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sys/modules/sound/driver/hda/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L sys/modules/sound/driver/hda/Makefile -L sys/modules/sound/driver/hda/Makefile -u -r1.1 -r1.2
--- sys/modules/sound/driver/hda/Makefile
+++ sys/modules/sound/driver/hda/Makefile
@@ -1,4 +1,3 @@
-# $MidnightBSD$
 # $FreeBSD: src/sys/modules/sound/driver/hda/Makefile,v 1.1 2006/10/01 11:13:00 ariff Exp $
 
 .PATH: ${.CURDIR}/../../../../dev/sound/pci/hda