Merge branch 'for-linus' of git://www.jni.nu/cris

[~andy/linux] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 10478153641b50aa1254f42ecf49e95e2d75bbc3..4f7a5829ea4c0cbca2c7f5e76cb497b2c1708457 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -412,9 +412,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
 
        device_initialize(&shost->shost_gendev);
        dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);
-#ifndef CONFIG_SYSFS_DEPRECATED
        shost->shost_gendev.bus = &scsi_bus_type;
-#endif
        shost->shost_gendev.type = &scsi_host_type;
 
        device_initialize(&shost->shost_dev);