diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-14 11:03:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-14 11:03:50 -0800 |
| commit | 0f511ea70600efb1e06d7b55e1c51a83aff8713c (patch) | |
| tree | aff23d774e17528c27c57b949c5a60aa5c464dbf /drivers/scsi/scsi_transport_fc.c | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
| parent | ad58f7dbeb6f5ea82679962f18985f16b660a2d9 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] zfcp: fix device registration issues
[SCSI] scsi_transport_fc: fix FC_HOST_NUM_ATTRS
[SCSI] scsi: aha152x pcmcia driver needs spi transport
[SCSI] zfcp: correctly set this_id for hosts
[SCSI] Add Brownie to blacklist
Diffstat (limited to 'drivers/scsi/scsi_transport_fc.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 929032e370d..13ea64119b7 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -223,7 +223,7 @@ static void fc_rport_terminate(struct fc_rport *rport); */ #define FC_STARGET_NUM_ATTRS 3 #define FC_RPORT_NUM_ATTRS 9 -#define FC_HOST_NUM_ATTRS 16 +#define FC_HOST_NUM_ATTRS 17 struct fc_internal { struct scsi_transport_template t; |