driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices

[karo-tx-linux.git] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 8a8f803439e18cc2d267271adc3087e53fd619b6..ba7f87acc00d6b91cbc129b814d9c3569005fb6a 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -411,9 +411,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);