[patch] Possible solution

patch (text/plain), 1.40 KB, created by Daniel Drake (RETIRED) on 2005-06-19 04:56:11 UTC

diff -urNpX dontdiff linux-2.6.12-gentoo/drivers/scsi/megaraid/Kconfig.megaraid linux-dsd/drivers/scsi/megaraid/Kconfig.megaraid
--- linux-2.6.12-gentoo/drivers/scsi/megaraid/Kconfig.megaraid	2005-03-02 07:37:49.000000000 +0000
+++ linux-dsd/drivers/scsi/megaraid/Kconfig.megaraid	2005-06-19 12:47:39.000000000 +0100
@@ -64,7 +64,6 @@ config MEGARAID_MAILBOX
 	To compile this driver as a module, choose M here: the
 	module will be called megaraid_mbox
 
-if MEGARAID_NEWGEN=n
 config MEGARAID_LEGACY
 	tristate "LSI Logic Legacy MegaRAID Driver"
 	depends on PCI && SCSI
@@ -75,4 +74,4 @@ config MEGARAID_LEGACY
 
 	To compile this driver as a module, choose M here: the
 	module will be called megaraid
-endif
+
diff -urNpX dontdiff linux-2.6.12-gentoo/drivers/scsi/megaraid.c linux-dsd/drivers/scsi/megaraid.c
--- linux-2.6.12-gentoo/drivers/scsi/megaraid.c	2005-03-02 07:37:30.000000000 +0000
+++ linux-dsd/drivers/scsi/megaraid.c	2005-06-19 12:47:13.000000000 +0100
@@ -5043,8 +5043,10 @@ static struct pci_device_id megaraid_pci
 		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},
+#ifndef CONFIG_MEGARAID_NEWGEN
 	{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
 		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+#endif
 	{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,