rpms/kernel/devel kernel.spec, 1.529, 1.530 linux-2.6-wireless-pending.patch, 1.36, 1.37

[Kyle McMartin (kyle)]

Author: kyle

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

Modified Files:
	kernel.spec linux-2.6-wireless-pending.patch 
Log Message:
* Mon Mar 24 2008 Kyle McMartin <kmcmartin at redhat.com>
- wireless & firewire were merged.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.529
retrieving revision 1.530
diff -u -r1.529 -r1.530
--- kernel.spec	24 Mar 2008 16:33:53 -0000	1.529
+++ kernel.spec	24 Mar 2008 17:34:04 -0000	1.530
@@ -1085,7 +1085,7 @@
 ApplyPatch linux-2.6-ata-quirk.patch
 
 # wireless patches headed for 2.6.25
-ApplyPatch linux-2.6-wireless.patch
+#ApplyPatch linux-2.6-wireless.patch
 # wireless patches headed for 2.6.26
 ApplyPatch linux-2.6-wireless-pending.patch
 ApplyPatch linux-2.6-wireless-fixups.patch
@@ -1129,6 +1129,7 @@
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
 C=$(wc -l $RPM_SOURCE_DIR/linux-2.6-firewire-git-pending.patch | awk '{print $1}')
+C=0
 if [ "$C" -gt 10 ]; then
 ApplyPatch linux-2.6-firewire-git-pending.patch
 fi
@@ -1735,6 +1736,9 @@
 
 %changelog
 * Mon Mar 24 2008 Kyle McMartin <kmcmartin at redhat.com>
+- wireless & firewire were merged.
+
+* Mon Mar 24 2008 Kyle McMartin <kmcmartin at redhat.com>
 - Linux 2.6.25-rc6-git7
 
 * Mon Mar 24 2008 Kyle McMartin <kmcmartin at redhat.com>

linux-2.6-wireless-pending.patch:

Index: linux-2.6-wireless-pending.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-wireless-pending.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- linux-2.6-wireless-pending.patch	14 Mar 2008 21:25:58 -0000	1.36
+++ linux-2.6-wireless-pending.patch	24 Mar 2008 17:34:04 -0000	1.37
@@ -64602,19 +64602,6 @@
  
  	/*
  	 * Initialize the device.
-@@ -1145,11 +1039,8 @@ static int rt2x00lib_initialize(struct r
- 
- 	return 0;
- 
--exit_unitialize:
--	rt2x00lib_uninitialize(rt2x00dev);
--
- exit:
--	rt2x00lib_free_ring_entries(rt2x00dev);
-+	rt2x00lib_uninitialize(rt2x00dev);
- 
- 	return status;
- }
 @@ -1165,11 +1056,9 @@ int rt2x00lib_start(struct rt2x00_dev *r
  	 * If this is the first interface which is added,
  	 * we should load the firmware now.