rpms/kernel/devel kernel-2.6.spec, 1.1459, 1.1460 linux-2.6.9-scsi-megaraid-legacy.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	kernel-2.6.spec linux-2.6.9-scsi-megaraid-legacy.patch 
Log Message:
Improve megaraid compatiblity hack.
(Now the legacy driver doesn't claim support for the drivers
that the newer driver supports).




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1459
retrieving revision 1.1460
diff -u -r1.1459 -r1.1460
--- kernel-2.6.spec	8 Aug 2005 22:10:40 -0000	1.1459
+++ kernel-2.6.spec	9 Aug 2005 03:38:59 -0000	1.1460
@@ -1198,6 +1198,11 @@
 %endif
 
 %changelog
+* Mon Aug 08 2005 Dave Jones <davej at redhat.com>
+- Improve megaraid compatiblity hack.
+  (Now the legacy driver doesn't claim support for the drivers
+   that the newer driver supports).
+
 * Sun Aug 07 2005 Dave Jones <davej at redhat.com>
 - 2.6.13-rc6
 

linux-2.6.9-scsi-megaraid-legacy.patch:
 linux-1102/drivers/scsi/megaraid/Kconfig.megaraid |    2 --
 linux-2.6.12/drivers/scsi/megaraid.c              |   12 +-----------
 linux-2.6.12/drivers/scsi/megaraid.h              |    4 ----
 3 files changed, 1 insertion(+), 17 deletions(-)

Index: linux-2.6.9-scsi-megaraid-legacy.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6.9-scsi-megaraid-legacy.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6.9-scsi-megaraid-legacy.patch	22 Mar 2005 07:00:34 -0000	1.2
+++ linux-2.6.9-scsi-megaraid-legacy.patch	9 Aug 2005 03:38:59 -0000	1.3
@@ -14,3 +14,53 @@
  	To compile this driver as a module, choose M here: the
  	module will be called megaraid
 -endif
+
+--- linux-2.6.12/drivers/scsi/megaraid.c~	2005-08-08 23:25:13.000000000 -0400
++++ linux-2.6.12/drivers/scsi/megaraid.c	2005-08-08 23:31:14.000000000 -0400
+@@ -5014,22 +5014,12 @@ megaraid_shutdown(struct pci_dev *pdev)
+ }
+ 
+ static struct pci_device_id megaraid_pci_tbl[] = {
+-	{PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DISCOVERY,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+-	{PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_PERC4_DI,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
+-	{PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_PERC4_QC_VERDE,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
+ 	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
+ 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ 	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
+ 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+-	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ 	{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
+ 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+-	{PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3,
+-		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+ 	{0,}
+ };
+ MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
+--- linux-2.6.12/drivers/scsi/megaraid.h~	2005-08-08 23:26:41.000000000 -0400
++++ linux-2.6.12/drivers/scsi/megaraid.h	2005-08-08 23:33:14.000000000 -0400
+@@ -73,10 +73,6 @@
+ #define PCI_DEVICE_ID_AMI_MEGARAID3	0x1960
+ #endif
+ 
+-#define PCI_DEVICE_ID_DISCOVERY		0x000E
+-#define PCI_DEVICE_ID_PERC4_DI		0x000F
+-#define PCI_DEVICE_ID_PERC4_QC_VERDE	0x0407
+-
+ /* Sub-System Vendor IDs */
+ #define	AMI_SUBSYS_VID			0x101E
+ #define DELL_SUBSYS_VID			0x1028
+--- linux-2.6.12/drivers/scsi/megaraid.c~	2005-08-08 23:33:34.000000000 -0400
++++ linux-2.6.12/drivers/scsi/megaraid.c	2005-08-08 23:33:52.000000000 -0400
+@@ -5025,7 +5025,7 @@ static struct pci_device_id megaraid_pci
+ MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
+ 
+ static struct pci_driver megaraid_pci_driver = {
+-	.name		= "megaraid",
++	.name		= "megaraid_legacy",
+ 	.id_table	= megaraid_pci_tbl,
+ 	.probe		= megaraid_probe_one,
+ 	.remove		= __devexit_p(megaraid_remove_one),