diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 12:58:02 -0500 |
| commit | 1a02e59a2970f9ed28ab51d3b08624b79e54d848 (patch) | |
| tree | 470cce472be3b08c160e0c569648e7228651b12a /drivers/scsi/megaraid.c | |
| parent | ebcff3c773b42bce6182ec16485abca4e53fba97 (diff) | |
| parent | 2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/megaraid.c')
| -rw-r--r-- | drivers/scsi/megaraid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index d101a8a6f4e8..7144674bc8e6 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
| @@ -5049,7 +5049,7 @@ static struct pci_device_id megaraid_pci_tbl[] = { | |||
| 5049 | MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl); | 5049 | MODULE_DEVICE_TABLE(pci, megaraid_pci_tbl); |
| 5050 | 5050 | ||
| 5051 | static struct pci_driver megaraid_pci_driver = { | 5051 | static struct pci_driver megaraid_pci_driver = { |
| 5052 | .name = "megaraid", | 5052 | .name = "megaraid_legacy", |
| 5053 | .id_table = megaraid_pci_tbl, | 5053 | .id_table = megaraid_pci_tbl, |
| 5054 | .probe = megaraid_probe_one, | 5054 | .probe = megaraid_probe_one, |
| 5055 | .remove = __devexit_p(megaraid_remove_one), | 5055 | .remove = __devexit_p(megaraid_remove_one), |