From owner-svn-src-stable@FreeBSD.ORG Tue May 22 02:24:53 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8689B106566C; Tue, 22 May 2012 02:24:53 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 57FF58FC22; Tue, 22 May 2012 02:24:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4M2Orpv082861; Tue, 22 May 2012 02:24:53 GMT (envelope-from pfg@svn.freebsd.org) Received: (from pfg@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4M2Or4Q082858; Tue, 22 May 2012 02:24:53 GMT (envelope-from pfg@svn.freebsd.org) Message-Id: <201205220224.q4M2Or4Q082858@svn.freebsd.org> From: "Pedro F. Giffuni" Date: Tue, 22 May 2012 02:24:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235769 - in stable/9/sys: amd64/conf i386/conf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2012 02:24:53 -0000 Author: pfg Date: Tue May 22 02:24:52 2012 New Revision: 235769 URL: http://svn.freebsd.org/changeset/base/235769 Log: MFC: r233310 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. Requested by: joel Discussed with: jhb, joel, Yuriy Tsibizov Approved by: jhb (mentor) Modified: stable/9/sys/amd64/conf/GENERIC stable/9/sys/i386/conf/GENERIC Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/amd64/conf/GENERIC ============================================================================== --- stable/9/sys/amd64/conf/GENERIC Tue May 22 02:11:08 2012 (r235768) +++ stable/9/sys/amd64/conf/GENERIC Tue May 22 02:24:52 2012 (r235769) @@ -337,6 +337,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: stable/9/sys/i386/conf/GENERIC ============================================================================== --- stable/9/sys/i386/conf/GENERIC Tue May 22 02:11:08 2012 (r235768) +++ stable/9/sys/i386/conf/GENERIC Tue May 22 02:24:52 2012 (r235769) @@ -350,6 +350,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