/[linux-patches]/genpatches-2.6/trunk/2.6.12/4351_megaraid-compatibility.patch
Gentoo

Contents of /genpatches-2.6/trunk/2.6.12/4351_megaraid-compatibility.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 70 - (show annotations) (download) (as text)
Wed Jun 29 15:34:26 2005 UTC (15 years, 2 months ago) by dsd
File MIME type: text/x-diff
File size: 1980 byte(s)
Megaraid driver update, and a patch to allow both megaraid drivers to be built side-by-side
1 diff -urp linux-2.6.12/drivers/scsi-orig/megaraid/Kconfig.megaraid linux-2.6.12/drivers/scsi/megaraid/Kconfig.megaraid
2 --- 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 @@ -75,4 +74,4 @@ config MEGARAID_LEGACY
13
14 To compile this driver as a module, choose M here: the
15 module will be called megaraid
16 -endif
17 +
18 diff -urp linux-2.6.12/drivers/scsi-orig/megaraid.c linux-2.6.12/drivers/scsi/megaraid.c
19 --- linux-2.6.12/drivers/scsi-orig/megaraid.c 2005-06-29 16:19:55.000000000 +0100
20 +++ linux-2.6.12/drivers/scsi/megaraid.c 2005-06-29 16:25:22.000000000 +0100
21 @@ -5033,22 +5033,28 @@ megaraid_shutdown(struct device *dev)
22 }
23
24 static struct pci_device_id megaraid_pci_tbl[] = {
25 +#ifndef CONFIG_MEGARAID_NEWGEN
26 {PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DISCOVERY,
27 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
28 {PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_PERC4_DI,
29 PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
30 {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_PERC4_QC_VERDE,
31 PCI_ANY_ID, PCI_ANY_ID, 0, 0, BOARD_64BIT},
32 +#endif
33 {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID,
34 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
35 {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID2,
36 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
37 +#ifndef CONFIG_MEGARAID_NEWGEN
38 {PCI_VENDOR_ID_AMI, PCI_DEVICE_ID_AMI_MEGARAID3,
39 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
40 +#endif
41 {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_AMI_MEGARAID3,
42 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
43 +#ifndef CONFIG_MEGARAID_NEWGEN
44 {PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_AMI_MEGARAID3,
45 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
46 +#endif
47 {0,}
48 };
49 MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl);

  ViewVC Help
Powered by ViewVC 1.1.20