diff --git a/[refs] b/[refs] index 0d2ffc3ec44e..1973f3f277ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a192ec334cab9fafe3a8665a65af398b0e24730 +refs/heads/master: e5779a583ddb9916b37cfbb916dc53ec2eaf0b9b diff --git a/trunk/drivers/scsi/a4000t.c b/trunk/drivers/scsi/a4000t.c index 6d25aca7b412..61af3d91ac8a 100644 --- a/trunk/drivers/scsi/a4000t.c +++ b/trunk/drivers/scsi/a4000t.c @@ -61,7 +61,8 @@ static int __devinit a4000t_probe(struct platform_device *dev) hostdata->dcntl_extra = EA_710; /* and register the chip */ - host = NCR_700_detect(&a4000t_scsi_driver_template, hostdata, dev); + host = NCR_700_detect(&a4000t_scsi_driver_template, hostdata, + &dev->dev); if (!host) { printk(KERN_ERR "a4000t-scsi: No host detected; " "board configuration problem?\n"); diff --git a/trunk/drivers/scsi/bvme6000_scsi.c b/trunk/drivers/scsi/bvme6000_scsi.c index 9e9a82b03f2d..5799cb5cba6b 100644 --- a/trunk/drivers/scsi/bvme6000_scsi.c +++ b/trunk/drivers/scsi/bvme6000_scsi.c @@ -58,7 +58,8 @@ bvme6000_probe(struct platform_device *dev) hostdata->ctest7_extra = CTEST7_TT1; /* and register the chip */ - host = NCR_700_detect(&bvme6000_scsi_driver_template, hostdata, dev); + host = NCR_700_detect(&bvme6000_scsi_driver_template, hostdata, + &dev->dev); if (!host) { printk(KERN_ERR "bvme6000-scsi: No host detected; " "board configuration problem?\n"); diff --git a/trunk/drivers/scsi/mvme16x_scsi.c b/trunk/drivers/scsi/mvme16x_scsi.c index 7794fc158b17..b5fbfd6ce870 100644 --- a/trunk/drivers/scsi/mvme16x_scsi.c +++ b/trunk/drivers/scsi/mvme16x_scsi.c @@ -64,7 +64,8 @@ mvme16x_probe(struct platform_device *dev) hostdata->ctest7_extra = CTEST7_TT1; /* and register the chip */ - host = NCR_700_detect(&mvme16x_scsi_driver_template, hostdata, dev); + host = NCR_700_detect(&mvme16x_scsi_driver_template, hostdata, + &dev->dev); if (!host) { printk(KERN_ERR "mvme16x-scsi: No host detected; " "board configuration problem?\n");