diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/s390/scsi/zfcp_fsf.c | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_fsf.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_fsf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index eabf86bb13f5..ef16f7ca4bb1 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
| @@ -4560,7 +4560,7 @@ zfcp_fsf_req_sbal_check(unsigned long *flags, | |||
| 4560 | /* | 4560 | /* |
| 4561 | * set qtcb pointer in fsf_req and initialize QTCB | 4561 | * set qtcb pointer in fsf_req and initialize QTCB |
| 4562 | */ | 4562 | */ |
| 4563 | static inline void | 4563 | static void |
| 4564 | zfcp_fsf_req_qtcb_init(struct zfcp_fsf_req *fsf_req) | 4564 | zfcp_fsf_req_qtcb_init(struct zfcp_fsf_req *fsf_req) |
| 4565 | { | 4565 | { |
| 4566 | if (likely(fsf_req->qtcb != NULL)) { | 4566 | if (likely(fsf_req->qtcb != NULL)) { |