| 1 |
dsd |
73 |
diff -urNp linux-2.6.12/drivers/scsi-orig/megaraid/Kconfig.megaraid linux-2.6.12/drivers/scsi/megaraid/Kconfig.megaraid
|
| 2 |
dsd |
70 |
--- linux-2.6.12/drivers/scsi-orig/megaraid/Kconfig.megaraid 2005-06-29 16:19:55.000000000 +0100
|
| 3 |
|
|
+++ linux-2.6.12/drivers/scsi/megaraid/Kconfig.megaraid 2005-06-29 16:22:12.000000000 +0100
|
| 4 |
|
|
@@ -64,7 +64,6 @@ config MEGARAID_MAILBOX
|
| 5 |
|
|
To compile this driver as a module, choose M here: the
|
| 6 |
|
|
module will be called megaraid_mbox
|
| 7 |
|
|
|
| 8 |
|
|
-if MEGARAID_NEWGEN=n
|
| 9 |
|
|
config MEGARAID_LEGACY
|
| 10 |
|
|
tristate "LSI Logic Legacy MegaRAID Driver"
|
| 11 |
|
|
depends on PCI && SCSI
|
| 12 |
dsd |
179 |
@@ -75,6 +74,6 @@ config MEGARAID_LEGACY
|
| 13 |
dsd |
70 |
|
| 14 |
|
|
To compile this driver as a module, choose M here: the
|
| 15 |
|
|
module will be called megaraid
|
| 16 |
|
|
-endif
|
| 17 |
|
|
+
|
| 18 |
dsd |
179 |
|
| 19 |
|
|
config MEGARAID_SAS
|
| 20 |
dsd |
73 |
diff -urNp linux-2.6.12/drivers/scsi-orig/megaraid.c linux-2.6.12/drivers/scsi/megaraid.c
|
| 21 |
dsd |
70 |
--- linux-2.6.12/drivers/scsi-orig/megaraid.c 2005-06-29 16:19:55.000000000 +0100
|
| 22 |
dsd |
73 |
+++ linux-2.6.12/drivers/scsi/megaraid.c 2005-06-30 13:07:41.000000000 +0100
|
| 23 |
|
|
@@ -5033,28 +5033,34 @@ megaraid_shutdown(struct device *dev)
|
| 24 |
dsd |
70 |
}
|
| 25 |
|
|
|
| 26 |
|
|
static struct pci_device_id megaraid_pci_tbl[] = {
|
| 27 |
|
|
+#ifndef CONFIG_MEGARAID_NEWGEN
|
| 28 |
|
|
{PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DISCOVERY,
|
| 29 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
| 30 |
|
|
{PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_PERC4_DI,
|
| 31 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
|
| 32 |
|
|
{PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_PERC4_QC_VERDE,
|
| 33 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
|
| 34 |
|
|
+#endif
|
| 35 |
|
|
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
|
| 36 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
| 37 |
|
|
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
|
| 38 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
| 39 |
|
|
+#ifndef CONFIG_MEGARAID_NEWGEN
|
| 40 |
|
|
{PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
|
| 41 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
| 42 |
|
|
+#endif
|
| 43 |
|
|
{PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
|
| 44 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
| 45 |
|
|
+#ifndef CONFIG_MEGARAID_NEWGEN
|
| 46 |
|
|
{PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3,
|
| 47 |
|
|
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
|
| 48 |
|
|
+#endif
|
| 49 |
|
|
{0,}
|
| 50 |
|
|
};
|
| 51 |
|
|
MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);
|
| 52 |
dsd |
73 |
|
| 53 |
|
|
static struct pci_driver megaraid_pci_driver = {
|
| 54 |
|
|
- .name = "megaraid",
|
| 55 |
|
|
+ .name = "megaraid_legacy",
|
| 56 |
|
|
.id_table = megaraid_pci_tbl,
|
| 57 |
|
|
.probe = megaraid_probe_one,
|
| 58 |
|
|
.remove = __devexit_p(megaraid_remove_one),
|
Parent Directory
| 
Revision Log