rpms/kernel-xen-2.6/devel kernel-2.6.21-i686-xen.config, 1.5, 1.6 kernel-2.6.21-x86_64-xen.config, 1.6, 1.7 kernel-xen.spec, 1.61, 1.62

[Eduardo Habkost (ehabkost)]

Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21167

Modified Files:
	kernel-2.6.21-i686-xen.config kernel-2.6.21-x86_64-xen.config 
	kernel-xen.spec 
Log Message:
Revert last commit

fw-sbp2 module would be useless without fw-ohci. Duh.




Index: kernel-2.6.21-i686-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-i686-xen.config,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- kernel-2.6.21-i686-xen.config	27 Sep 2007 14:39:03 -0000	1.5
+++ kernel-2.6.21-i686-xen.config	27 Sep 2007 16:15:49 -0000	1.6
@@ -1315,9 +1315,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_OHCI is not set
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-2.6.21-x86_64-xen.config
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-2.6.21-x86_64-xen.config,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kernel-2.6.21-x86_64-xen.config	27 Sep 2007 14:39:03 -0000	1.6
+++ kernel-2.6.21-x86_64-xen.config	27 Sep 2007 16:15:49 -0000	1.7
@@ -1221,9 +1221,7 @@
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_FIREWIRE=m
-# CONFIG_FIREWIRE_OHCI is not set
-CONFIG_FIREWIRE_SBP2=m
+# CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 
 #


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- kernel-xen.spec	27 Sep 2007 14:39:03 -0000	1.61
+++ kernel-xen.spec	27 Sep 2007 16:15:49 -0000	1.62
@@ -2362,10 +2362,6 @@
 #  - tux.
 
 %changelog
-* Thu Sep 27 2007 Eduardo Habkost <ehabkost at redhat.com>
-- Reenabled Firewire but kept fw-ohci disabled (bug #307461).
-  fw-sbp2 should be working
-
 * Wed Sep 26 2007 Eduardo Habkost <ehabkost at redhat.com>
 - Disable Firewire on i686. It is not supported by the current
   Xen swiotlb implementation (bug #307461)