--- sys/conf/files.orig	Mon Oct 16 13:36:19 2006
+++ sys/conf/files	Mon Oct 16 18:23:38 2006
@@ -60,6 +60,21 @@
 	compile-with	"CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"emu10k1-alsa%diked.h"
+emu10k1-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"emu10k1-alsa%diked.h"
+p16v-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"p16v-alsa%diked.h"
+p17v-alsa%diked.h		optional snd_emu10kx pci			   \
+	dependency	"$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \
+	compile-with	"CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \
+	no-obj no-implicit-rule before-depend				   \
+	clean		"p17v-alsa%diked.h"
 miidevs.h			optional miibus				   \
 	dependency	"$S/tools/miidevs2h.awk $S/dev/mii/miidevs"	   \
 	compile-with	"${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
@@ -850,7 +865,6 @@
 dev/sn/if_sn_pccard.c		optional sn pccard
 dev/snp/snp.c			optional snp
 dev/sound/isa/ad1816.c		optional snd_ad1816 isa
-dev/sound/isa/es1888.c		optional snd_ess isa
 dev/sound/isa/ess.c		optional snd_ess isa
 dev/sound/isa/gusc.c		optional snd_gusc isa
 dev/sound/isa/mss.c		optional snd_mss isa
@@ -863,22 +877,41 @@
 #dev/sound/pci/au88x0.c		optional snd_au88x0 pci
 dev/sound/pci/cmi.c		optional snd_cmi pci
 dev/sound/pci/cs4281.c		optional snd_cs4281 pci
-dev/sound/pci/csa.c		optional snd_csa pci
+dev/sound/pci/csa.c		optional snd_csa pci \
+	warning "kernel contains GPL contaminated csaimg.h header"
 dev/sound/pci/csapcm.c		optional snd_csa pci
 dev/sound/pci/ds1.c		optional snd_ds1 pci
 dev/sound/pci/emu10k1.c		optional snd_emu10k1 pci \
 	dependency "emu10k1-alsa%diked.h"
+dev/sound/pci/emu10kx.c		optional snd_emu10kx pci \
+	dependency "emu10k1-alsa%diked.h" \
+	dependency "p16v-alsa%diked.h" \
+	dependency "p17v-alsa%diked.h" \
+	warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/emu10kx-pcm.c	optional snd_emu10kx pci \
+	dependency "emu10k1-alsa%diked.h" \
+	dependency "p16v-alsa%diked.h" \
+	dependency "p17v-alsa%diked.h" \
+	warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/emu10kx-midi.c	optional snd_emu10kx pci \
+	dependency "emu10k1-alsa%diked.h" \
+	warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/envy24.c		optional snd_envy24 pci
+dev/sound/pci/envy24ht.c	optional snd_envy24ht pci
 dev/sound/pci/es137x.c		optional snd_es137x pci
 dev/sound/pci/fm801.c		optional snd_fm801 pci
 dev/sound/pci/ich.c		optional snd_ich pci
 dev/sound/pci/maestro.c 	optional snd_maestro pci
-dev/sound/pci/maestro3.c	optional snd_maestro3 pci
+dev/sound/pci/maestro3.c	optional snd_maestro3 pci \
+	warning "kernel contains GPL contaminated maestro3 headers"
 dev/sound/pci/neomagic.c	optional snd_neomagic pci
 dev/sound/pci/solo.c		optional snd_solo pci
+dev/sound/pci/spicds.c		optional snd_spicds pci
 dev/sound/pci/t4dwave.c		optional snd_t4dwave pci
 dev/sound/pci/via8233.c		optional snd_via8233 pci
 dev/sound/pci/via82c686.c	optional snd_via82c686 pci
 dev/sound/pci/vibes.c		optional snd_vibes pci
+dev/sound/pci/hda/hdac.c	optional snd_hda pci
 dev/sound/pcm/ac97.c		optional sound
 dev/sound/pcm/ac97_if.m		optional sound
 dev/sound/pcm/ac97_patch.c	optional sound
@@ -900,6 +933,12 @@
 #dev/sound/usb/upcm.c		optional snd_upcm usb
 dev/sound/usb/uaudio.c		optional snd_uaudio usb
 dev/sound/usb/uaudio_pcm.c	optional snd_uaudio usb
+dev/sound/midi/midi.c		optional sound
+dev/sound/midi/mpu401.c		optional sound
+dev/sound/midi/mpu_if.m		optional sound
+dev/sound/midi/mpufoi_if.m	optional sound
+dev/sound/midi/sequencer.c	optional sound
+dev/sound/midi/synth_if.m	optional sound
 dev/sr/if_sr.c			optional sr
 dev/sr/if_sr_pci.c		optional sr pci
 dev/stg/tmc18c30.c		optional stg
--- sys/conf/kmod.mk.orig	Wed Sep 13 16:40:20 2006
+++ sys/conf/kmod.mk	Sat Oct 14 22:01:21 2006
@@ -336,7 +336,8 @@
 	dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
 	dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
 	dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m dev/uart/uart_if.m \
-	dev/usb/usb_if.m isa/isa_if.m \
+	dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \
+	dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \
 	kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \
 	libkern/iconv_converter_if.m opencrypto/crypto_if.m \
 	pc98/pc98/canbus_if.m pci/agp_if.m
--- sys/conf/options.orig	Tue Oct 17 01:17:54 2006
+++ sys/conf/options	Tue Oct 17 01:19:23 2006
@@ -727,3 +727,6 @@
 
 # XBOX options for FreeBSD/i386, but some files are MI
 XBOX			opt_xbox.h
+
+# snd_emu10kx sound driver options
+SND_EMU10KX_MULTICHANNEL	opt_emu10kx.h