diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 23:16:07 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 23:16:07 +0300 |
| commit | 12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3 (patch) | |
| tree | 158610ef6c7711afb60d78956ab4b131bf6a08ef /drivers/s390/scsi/zfcp_sysfs_unit.c | |
| parent | 61b7efddc5256225099d13185659e9ad9d8abc8a (diff) | |
| parent | fc091e03820bf67e543362bd40959701a71d0c27 (diff) | |
| download | linux-12dbf3fc4d06d2c0c4c44dc0612df04248b3cfd3.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
Diffstat (limited to 'drivers/s390/scsi/zfcp_sysfs_unit.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_sysfs_unit.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_sysfs_unit.c b/drivers/s390/scsi/zfcp_sysfs_unit.c index 0556642c9e1d..2f50815f65c7 100644 --- a/drivers/s390/scsi/zfcp_sysfs_unit.c +++ b/drivers/s390/scsi/zfcp_sysfs_unit.c @@ -65,7 +65,6 @@ static ssize_t zfcp_sysfs_unit_##_name##_show(struct device *dev, struct device_ static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_unit_##_name##_show, NULL); ZFCP_DEFINE_UNIT_ATTR(status, "0x%08x\n", atomic_read(&unit->status)); -ZFCP_DEFINE_UNIT_ATTR(scsi_lun, "0x%x\n", unit->scsi_lun); ZFCP_DEFINE_UNIT_ATTR(in_recovery, "%d\n", atomic_test_mask (ZFCP_STATUS_COMMON_ERP_INUSE, &unit->status)); ZFCP_DEFINE_UNIT_ATTR(access_denied, "%d\n", atomic_test_mask @@ -138,7 +137,6 @@ static DEVICE_ATTR(failed, S_IWUSR | S_IRUGO, zfcp_sysfs_unit_failed_show, zfcp_sysfs_unit_failed_store); static struct attribute *zfcp_unit_attrs[] = { - &dev_attr_scsi_lun.attr, &dev_attr_failed.attr, &dev_attr_in_recovery.attr, &dev_attr_status.attr, |