diff options
| author | joel <joel@FreeBSD.org> | 2012-03-22 16:19:04 +0000 |
|---|---|---|
| committer | joel <joel@FreeBSD.org> | 2012-03-22 16:19:04 +0000 |
| commit | 5dd021f67facab9bb24421d79c8a289029193a8f (patch) | |
| tree | fd12ebdd583ae7c911d4e9594f03d59767111a91 /sys/i386/conf | |
| parent | 5cbc1e69ab9389157f33be6774f87a2edb718d28 (diff) | |
| download | FreeBSD-src-5dd021f67facab9bb24421d79c8a289029193a8f.zip FreeBSD-src-5dd021f67facab9bb24421d79c8a289029193a8f.tar.gz | |
Add snd_cmi, snd_csa and snd_emu10kx to GENERIC on i386 and amd64.
The GPL infected parts which were blocking the inclusion of snd_csa
and snd_emu10kx in GENERIC have recently been removed from the tree.
I'm also adding snd_cmi to GENERIC, which I originally intended to
add when we enabled sound support by default.
Discussed with: jhb, pfg, Yuriy Tsibizov <yuriy.tsibizov@gfk.ru>
Approved by: jhb
Diffstat (limited to 'sys/i386/conf')
| -rw-r--r-- | sys/i386/conf/GENERIC | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index f716521..667c95b 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -329,6 +329,9 @@ device dcons_crom # Configuration ROM for dcons # Sound support device sound # Generic sound driver (required) +device snd_cmi # CMedia CMI8338/CMI8738 +device snd_csa # Crystal Semiconductor CS461x/428x +device snd_emu10kx # Creative SoundBlaster Live! and Audigy device snd_es137x # Ensoniq AudioPCI ES137x device snd_hda # Intel High Definition Audio device snd_ich # Intel, NVidia and other ICH AC'97 Audio |
