diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:27:53 -0400 |
| commit | c54f9da1c8ceee19436430afac0798a989eb886d (patch) | |
| tree | 412f51c3f2641e4205b767cec95ce6107cd39d36 /drivers/message/fusion/mptfc.c | |
| parent | a2eddfa95919a730e0e5ed17e9c303fe5ba249cd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into x86/irqstats
Diffstat (limited to 'drivers/message/fusion/mptfc.c')
| -rw-r--r-- | drivers/message/fusion/mptfc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index 3cdd4e962115..1e24ab4ac38c 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
| @@ -1238,8 +1238,6 @@ mptfc_probe(struct pci_dev *pdev, const struct pci_device_id *id) | |||
| 1238 | sh->max_id = ioc->pfacts->MaxDevices; | 1238 | sh->max_id = ioc->pfacts->MaxDevices; |
| 1239 | sh->max_lun = max_lun; | 1239 | sh->max_lun = max_lun; |
| 1240 | 1240 | ||
| 1241 | sh->this_id = ioc->pfacts[0].PortSCSIID; | ||
| 1242 | |||
| 1243 | /* Required entry. | 1241 | /* Required entry. |
| 1244 | */ | 1242 | */ |
| 1245 | sh->unique_id = ioc->id; | 1243 | sh->unique_id = ioc->id; |