diff options
author | Ju, Seokmann <Seokmann.Ju@lsil.com> | 2006-02-09 14:32:59 -0500 |
---|---|---|
committer | <jejb@mulgrave.il.steeleye.com> | 2006-02-12 12:11:09 -0500 |
commit | 3542adcb354fea4fca792d36b91cb44d0da147e5 (patch) | |
tree | b567c729100959f70c92df5cce55283f63dca367 | |
parent | 4733804c9f62fbc17ba69e8654a5fdf465f5bc41 (diff) |
[SCSI] megaraid_legacy: kobject_register failure
Attached patch fixes problem that cause kobject_register failure
during loading. Kobject_register would fail when there are more than
1 module with same module name. This patch will change module name of
megaraid_legacy from 'megaraid' to 'megaraid_legacy'.
Signed-Off-by: Seokmann Ju <seokmann.ju@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/megaraid.c | 2 | ||||
-rw-r--r-- | drivers/scsi/megaraid.h | 2 |
2 files changed, 2 insertions, 2 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), |
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 4b3e0d6e5afa..4b75fe619d9c 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <linux/mutex.h> | 5 | #include <linux/mutex.h> |
6 | 6 | ||
7 | #define MEGARAID_VERSION \ | 7 | #define MEGARAID_VERSION \ |
8 | "v2.00.3 (Release Date: Wed Feb 19 08:51:30 EST 2003)\n" | 8 | "v2.00.4 (Release Date: Thu Feb 9 08:51:30 EST 2006)\n" |
9 | 9 | ||
10 | /* | 10 | /* |
11 | * Driver features - change the values to enable or disable features in the | 11 | * Driver features - change the values to enable or disable features in the |