Merge with /home/shaggy/git/linus-clean/

Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>

1 files changed, 0 insertions, 1 deletions

diff --git a/drivers/scsi/qlogicfc.c b/drivers/scsi/qlogicfc.c
index ddf0f4277ee8..a4b3b3fd4815 100644
--- a/drivers/scsi/qlogicfc.c
+++ b/drivers/scsi/qlogicfc.c
@@ -746,7 +746,6 @@ static int isp2x00_detect(Scsi_Host_Template * tmpt)
                                 printk("qlogicfc%d : could not register host.\n", hosts);
                                 continue;
                         }
-                        scsi_set_device(host, &pdev->dev);
                         host->max_id = QLOGICFC_MAX_ID + 1;
                         host->max_lun = QLOGICFC_MAX_LUN;
                         hostdata = (struct isp2x00_hostdata *) host->hostdata;