Date: Thu, 22 Mar 2012 16:19:04 +0000 (UTC) From: Joel Dahl <joel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r233310 - in head/sys: amd64/conf i386/conf Message-ID: <201203221619.q2MGJ477031642@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: joel (doc committer) Date: Thu Mar 22 16:19:04 2012 New Revision: 233310 URL: http://svn.freebsd.org/changeset/base/233310 Log: 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 Modified: head/sys/amd64/conf/GENERIC head/sys/i386/conf/GENERIC Modified: head/sys/amd64/conf/GENERIC ============================================================================== --- head/sys/amd64/conf/GENERIC Thu Mar 22 15:21:09 2012 (r233309) +++ head/sys/amd64/conf/GENERIC Thu Mar 22 16:19:04 2012 (r233310) @@ -316,6 +316,9 @@ device dcons_crom # Configuration ROM f # 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 Modified: head/sys/i386/conf/GENERIC ============================================================================== --- head/sys/i386/conf/GENERIC Thu Mar 22 15:21:09 2012 (r233309) +++ head/sys/i386/conf/GENERIC Thu Mar 22 16:19:04 2012 (r233310) @@ -329,6 +329,9 @@ device dcons_crom # Configuration ROM f # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203221619.q2MGJ477031642>