[kernel] r16658 - dists/trunk/linux-2.6/debian/config

[Ben Hutchings]

Author: benh
Date: Sun Dec  5 21:09:47 2010
New Revision: 16658

Log:
Rename/merge SND_HDA_CODEC_*_HDMI

Modified:
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Dec  5 21:07:48 2010	(r16657)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Dec  5 21:09:47 2010	(r16658)
@@ -4399,9 +4399,7 @@
 CONFIG_SND_HDA_CODEC_ANALOG=y
 CONFIG_SND_HDA_CODEC_SIGMATEL=y
 CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
+CONFIG_SND_HDA_CODEC_HDMI=y
 CONFIG_SND_HDA_CODEC_CIRRUS=y
 CONFIG_SND_HDA_CODEC_CONEXANT=y
 CONFIG_SND_HDA_CODEC_CA0110=y