Merge ../linux-2.6

This commit is contained in:
James Bottomley
2006-03-14 14:18:01 -06:00
398 changed files with 4041 additions and 2845 deletions

View File

@@ -1532,8 +1532,7 @@ fc_remote_port_add(struct Scsi_Host *shost, int channel,
}
/* Search the bindings array */
if (likely((ids->roles & FC_RPORT_ROLE_FCP_TARGET) &&
(fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE))) {
if (fc_host_tgtid_bind_type(shost) != FC_TGTID_BIND_NONE) {
/* search for a matching consistent binding */