diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:18:35 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:18:35 -0500 |
| commit | 7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c (patch) | |
| tree | 4cd7aae38012dfc1ff6c62be20ef8840e56d8383 /drivers/scsi/lpfc/lpfc_init.c | |
| parent | 392160335c798bbe94ab3aae6ea0c85d32b81bbc (diff) | |
| parent | 8224bfa84d510630b40ea460b2bb380c91acb8ae (diff) | |
| download | linux-7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c.tar.gz linux-7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c.tar.bz2 linux-7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c.zip | |
Merge HEAD from ../scsi-misc-2.6-tmp
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_init.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 34d416d2b007..6f3cb59bf9e0 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c @@ -28,6 +28,7 @@ #include <linux/pci.h> #include <linux/spinlock.h> +#include <scsi/scsi.h> #include <scsi/scsi_device.h> #include <scsi/scsi_host.h> #include <scsi/scsi_transport_fc.h> @@ -1339,14 +1340,12 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid) if (pci_request_regions(pdev, LPFC_DRIVER_NAME)) goto out_disable_device; - host = scsi_host_alloc(&lpfc_template, - sizeof (struct lpfc_hba) + sizeof (unsigned long)); + host = scsi_host_alloc(&lpfc_template, sizeof (struct lpfc_hba)); if (!host) goto out_release_regions; phba = (struct lpfc_hba*)host->hostdata; memset(phba, 0, sizeof (struct lpfc_hba)); - phba->link_stats = (void *)&phba[1]; phba->host = host; phba->fc_flag |= FC_LOADING; |