diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:18:35 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-08-28 11:18:35 -0500 |
| commit | 7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c (patch) | |
| tree | 4cd7aae38012dfc1ff6c62be20ef8840e56d8383 /drivers/scsi/scsi_transport_fc.c | |
| parent | 392160335c798bbe94ab3aae6ea0c85d32b81bbc (diff) | |
| parent | 8224bfa84d510630b40ea460b2bb380c91acb8ae (diff) | |
| download | op-kernel-dev-7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c.zip op-kernel-dev-7a93aef7fbac6f4db40b6fec5c0c6b654ae7a93c.tar.gz | |
Merge HEAD from ../scsi-misc-2.6-tmp
Diffstat (limited to 'drivers/scsi/scsi_transport_fc.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index e6412fc..2cab556 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -252,7 +252,8 @@ struct fc_internal { #define to_fc_internal(tmpl) container_of(tmpl, struct fc_internal, t) -static int fc_target_setup(struct device *dev) +static int fc_target_setup(struct transport_container *tc, struct device *dev, + struct class_device *cdev) { struct scsi_target *starget = to_scsi_target(dev); struct fc_rport *rport = starget_to_rport(starget); @@ -281,7 +282,8 @@ static DECLARE_TRANSPORT_CLASS(fc_transport_class, NULL, NULL); -static int fc_host_setup(struct device *dev) +static int fc_host_setup(struct transport_container *tc, struct device *dev, + struct class_device *cdev) { struct Scsi_Host *shost = dev_to_shost(dev); |
