rpms/kernel/F-7 linux-2.6-wireless.patch,1.20,1.21

[John W. Linville (linville)]

Author: linville

Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32745

Modified Files:
	linux-2.6-wireless.patch 
Log Message:
remove ssb patch which checks is_pcie (not in 2.6.23)

linux-2.6-wireless.patch:

Index: linux-2.6-wireless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/linux-2.6-wireless.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- linux-2.6-wireless.patch	9 Jan 2008 21:58:33 -0000	1.20
+++ linux-2.6-wireless.patch	9 Jan 2008 22:20:28 -0000	1.21
@@ -30,18 +30,6 @@
     Signed-Off-By: Andy Lutomirski <luto at myrealbox.com>
     Signed-off-by: John W. Linville <linville at tuxdriver.com>
 
-commit 3e9533e4d7bea8e9d7622da3baa1a1125cafbe17
-Author: Michael Buesch <mb at bu3sch.de>
-Date:   Thu Jan 3 18:59:25 2008 +0100
-
-    ssb: Fix probing of PCI cores if PCI and PCIE core is available
-    
-    This will make sure that always the correct core is selected, even if
-    there are both a PCI and PCI-E core on a PCI or PCI-E card.
-    
-    Signed-off-by: Michael Buesch <mb at bu3sch.de>
-    Signed-off-by: John W. Linville <linville at tuxdriver.com>
-
 commit 412e9e7800360ec93b6ba319b30666f6bfc721bd
 Author: Reinette Chatre <reinette.chatre at intel.com>
 Date:   Tue Dec 18 22:01:02 2007 -0800
@@ -135127,7 +135115,7 @@
 diff -up /dev/null linux-2.6.23.noarch/drivers/ssb/scan.c
 --- /dev/null	2008-01-09 08:24:16.586202496 -0500
 +++ linux-2.6.23.noarch/drivers/ssb/scan.c	2008-01-09 12:25:58.000000000 -0500
-@@ -0,0 +1,424 @@
+@@ -0,0 +1,413 @@
 +/*
 + * Sonics Silicon Backplane
 + * Bus scanning
@@ -135518,17 +135506,6 @@
 +		case SSB_DEV_PCI:
 +		case SSB_DEV_PCIE:
 +#ifdef CONFIG_SSB_DRIVER_PCICORE
-+			if (bus->bustype == SSB_BUSTYPE_PCI) {
-+				/* Ignore PCI cores on PCI-E cards.
-+				 * Ignore PCI-E cores on PCI cards. */
-+				if (dev->id.coreid == SSB_DEV_PCI) {
-+					if (bus->host_pci->is_pcie)
-+						continue;
-+				} else {
-+					if (!bus->host_pci->is_pcie)
-+						continue;
-+				}
-+			}
 +			if (bus->pcicore.dev) {
 +				ssb_printk(KERN_WARNING PFX
 +					   "WARNING: Multiple PCI(E) cores found\n");