rpms/kernel/devel/configs config-generic,1.121,1.122

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel/configs
In directory cvs.devel.redhat.com:/tmp/cvs-serv18899/configs

Modified Files:
	config-generic 
Log Message:
git2



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/configs/config-generic,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- config-generic	2 Jan 2006 21:56:59 -0000	1.121
+++ config-generic	6 Jan 2006 09:08:14 -0000	1.122
@@ -462,6 +462,7 @@
 # CONFIG_SCSI_DEBUG is not set
 CONFIG_SCSI_DC390T=m
 CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA2XXX_EMBEDDED_FIRMWARE is not set
 CONFIG_SCSI_QLA21XX=m
 CONFIG_SCSI_QLA22XX=m
 CONFIG_SCSI_QLA2300=m
@@ -982,6 +983,7 @@
 # CONFIG_SK98LIN is not set
 CONFIG_SKGE=m
 CONFIG_TIGON3=m
+CONFIG_SKY2=m
 
 #
 # Ethernet (10000 Mbit)
@@ -1040,8 +1042,9 @@
 CONFIG_IEEE80211_CRYPT_TKIP=m
 CONFIG_IEEE80211_SOFTMAC=m
 # CONFIG_IPW2100 is not set
-# CONFIG_IPW_DEBUG is not set
 # CONFIG_IPW2200 is not set
+# CONFIG_IPW2100_DEBUG is not set
+# CONFIG_IPW2200_DEBUG is not set
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1855,6 +1858,8 @@
 CONFIG_SND_RTCTIMER=m
 # CONFIG_SND_VERBOSE_PRINTK is not set
 # CONFIG_SND_DEBUG is not set
+CONFIG_SND_DYNAMIC_MINORS=y
+# CONFIG_SND_SUPPORT_OLD_API is not set
 
 #
 # Generic devices
@@ -1879,12 +1884,14 @@
 CONFIG_SND_CS46XX=m
 CONFIG_SND_CS46XX_NEW_DSP=y
 CONFIG_SND_CS4281=m
+CONFIG_SND_CS5535AUDIO=m
 CONFIG_SND_EMU10K1=m
 CONFIG_SND_EMU10K1X=m
 CONFIG_SND_CA0106=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_NM256=m
 CONFIG_SND_RME32=m
+CONFIG_SND_PCXHR=m
 CONFIG_SND_RME96=m
 CONFIG_SND_RME9652=m
 CONFIG_SND_HDSP=m
@@ -1984,6 +1991,7 @@
 CONFIG_USB_STORAGE_JUMPSHOT=y
 CONFIG_USB_STORAGE_USBAT=y
 CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_STORAGE_ALAUDA=y
 CONFIG_USB_LIBUSUAL=y
 
 #
@@ -2141,6 +2149,7 @@
 # CONFIG_USB_FILE_STORAGE_TEST is not set
 CONFIG_USB_MTOUCH=m
 CONFIG_USB_ATI_REMOTE=m
+CONFIG_USB_ATI_REMOTE2=m
 CONFIG_USB_ALI_M5632=y
 # CONFIG_USB_CYTHERM is not set
 CONFIG_USB_EGALAX=m
@@ -2156,6 +2165,7 @@
 CONFIG_USB_ATM=m
 CONFIG_USB_CXACRU=m
 CONFIG_USB_XUSBATM=m
+CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_KEYSPAN_REMOTE=m
 CONFIG_USB_LD=m
 CONFIG_USB_APPLETOUCH=m
@@ -2404,6 +2414,7 @@
 #
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
+CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
 # CONFIG_SECURITY_ROOTPLUG is not set
 CONFIG_SECURITY_SELINUX=y
@@ -2630,3 +2641,5 @@
 # CONFIG_SND_PDAUDIOCF is not set
 
 ## END of ISA options.
+
+