rpms/kernel/devel linux-2.6-ppc-dac960-ipr-clash.patch, NONE, 1.1 kernel-2.6.spec, 1.2521, 1.2522

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ppc-dac960-ipr-clash.patch 
Log Message:
Fix PCI ID clash between ipr and dac960

linux-2.6-ppc-dac960-ipr-clash.patch:
 DAC960.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE linux-2.6-ppc-dac960-ipr-clash.patch ---
The PCI ID table in the DAC960 driver conflicts with some devices
that use the ipr driver. All ipr adapters that use this chip
have an IBM subvendor ID and all DAC960 adapters that use this
chip have a Mylex subvendor id.

Signed-off-by: Brian King <brking at us.ibm.com>
---

 linux-2.6-bjking1/drivers/block/DAC960.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.17.noarch/drivers/block/DAC960.c~	2006-08-03 16:50:56.000000000 -0400
+++ linux-2.6.17.noarch/drivers/block/DAC960.c	2006-08-03 16:51:38.000000000 -0400
@@ -7125,7 +7125,7 @@ static struct pci_device_id DAC960_id_ta
 	{
 		.vendor 	= PCI_VENDOR_ID_MYLEX,
 		.device		= PCI_DEVICE_ID_MYLEX_DAC960_GEM,
-		.subvendor	= PCI_ANY_ID,
+		.subvendor	= PCI_VENDOR_ID_MYLEX,
 		.subdevice	= PCI_ANY_ID,
 		.driver_data	= (unsigned long) &DAC960_GEM_privdata,
 	},


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2521
retrieving revision 1.2522
diff -u -r1.2521 -r1.2522
--- kernel-2.6.spec	3 Aug 2006 20:47:06 -0000	1.2521
+++ kernel-2.6.spec	3 Aug 2006 20:57:38 -0000	1.2522
@@ -281,9 +281,10 @@
 Patch209: linux-2.6-x86_64-opterons-synchronize-p-state-using-TSC.patch
 
 # 300 - 399   ppc(64)
-Patch305: linux-2.6-cell-mambo-drivers.patch
-Patch306: linux-2.6-hvc-console.patch
-Patch314: linux-2.6-ppc-rtas-check.patch
+Patch300: linux-2.6-ppc-dac960-ipr-clash.patch
+Patch301: linux-2.6-cell-mambo-drivers.patch
+Patch302: linux-2.6-hvc-console.patch
+Patch303: linux-2.6-ppc-rtas-check.patch
 
 # 400 - 499   ia64
 
@@ -744,12 +745,14 @@
 #
 # PowerPC
 #
+# IPR uses same ID as DAC960
+%patch300 -p1
 # Support the IBM Mambo simulator; core as well as disk and network drivers.
-%patch305 -p1
+%patch301 -p1
 # Make HVC console generic; support simulator console device using it.
-#%patch306 -p1
+#%patch302 -p1
 # Check properly for successful RTAS instantiation
-%patch314 -p1
+%patch303 -p1
 
 # S390
 # Kprobes.
@@ -1697,6 +1700,7 @@
 
 * Thu Aug  3 2006 Dave Jones <davej at redhat.com>
 - 2.6.18rc3-git3
+- Fix PCI ID clash between ipr and dac960
 
 * Thu Aug  3 2006 Jon Masters <jcm at redhat.com>
 - Copy .config to include/config/auto.conf to avoid unnecessary "make prepare".