rpms/kernel/FC-6/configs config-generic,1.269,1.270

[fedora-cvs-commits at redhat.com]

Author: cebbert

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

Modified Files:
	config-generic 
Log Message:
* Thu Jul 19 2007 Chuck Ebbert <cebbert at redhat.com>
- restore the libata COMBINED_MODE hacks
- set CONFIG_NF_CONNTRACK_PROC_COMPAT
- restore the old firewire stack
- new utrace backport



Index: config-generic
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-6/configs/config-generic,v
retrieving revision 1.269
retrieving revision 1.270
diff -u -r1.269 -r1.270
--- config-generic	10 Jul 2007 01:23:53 -0000	1.269
+++ config-generic	19 Jul 2007 17:46:36 -0000	1.270
@@ -603,14 +603,37 @@
 #
 # IEEE 1394 (FireWire) support (JUJU alternative stack)
 #
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 
 #
 # IEEE 1394 (FireWire) support
 #
-# CONFIG_IEEE1394 is not set
+CONFIG_IEEE1394=y
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_IEEE1394_OUI_DB=y
+
+#
+# Device Drivers
+#
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+# CONFIG_IEEE1394_EXPORT_FULL_API is not set
 
 #
 # I2O device support
@@ -767,7 +790,7 @@
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
 CONFIG_NF_CONNTRACK_EVENTS=y
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_FTP=m
 CONFIG_NF_CONNTRACK_H323=m