Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / scsi / scsi_scan.c

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 3d0a1e6e9c489cb79647c54e28865e79cc733d4c..087821fac8fe76d64b50b0beaad7b1dd3c2dff0c 100644 (file)
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -417,9 +417,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
        starget->reap_ref = 1;
        dev->parent = get_device(parent);
        dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id);
-#ifndef CONFIG_SYSFS_DEPRECATED
        dev->bus = &scsi_bus_type;
-#endif
        dev->type = &scsi_target_type;
        starget->id = id;
        starget->channel = channel;