svn commit: r235769 - in stable/9/sys: amd64/conf i386/conf

[Pedro F. Giffuni]

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 <yuriy.tsibizov at gfk.ru>
  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