Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6] / drivers / scsi / zorro7xx.c

diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c
index 93fa8b8d8a8b08bf0c04fc2182097d736ad919a8..c822debc2668ef687368443907c9ad2d1bca87f7 100644 (file)
--- a/drivers/scsi/zorro7xx.c
+++ b/drivers/scsi/zorro7xx.c
@@ -65,7 +65,6 @@ static struct zorro_device_id zorro7xx_zorro_tbl[] __devinitdata = {
        },
        { 0 }
 };
-MODULE_DEVICE_TABLE(zorro, zorro7xx_zorro_tbl);
 
 static int __devinit zorro7xx_init_one(struct zorro_dev *z,
                                       const struct zorro_device_id *ent)
@@ -131,6 +130,7 @@ static int __devinit zorro7xx_init_one(struct zorro_dev *z,
                goto out_put_host;
        }
 
+       zorro_set_drvdata(z, host);
        scsi_scan_host(host);
 
        return 0;
@@ -149,7 +149,7 @@ static int __devinit zorro7xx_init_one(struct zorro_dev *z,
 
 static __devexit void zorro7xx_remove_one(struct zorro_dev *z)
 {
-       struct Scsi_Host *host = dev_to_shost(&z->dev);
+       struct Scsi_Host *host = zorro_get_drvdata(z);
        struct NCR_700_Host_Parameters *hostdata = shost_priv(host);
 
        scsi_remove_host(host);