diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
| commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
| tree | ce595adde342f57f379d277b25e4dd206988a052 /drivers/scsi/libfc | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
| parent | 3e58974027b04e84f68b964ef368a6cd758e2f84 (diff) | |
| download | op-kernel-dev-318ae2edc3b29216abd8a2510f3f80b764f06858.zip op-kernel-dev-318ae2edc3b29216abd8a2510f3f80b764f06858.tar.gz | |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'drivers/scsi/libfc')
| -rw-r--r-- | drivers/scsi/libfc/fc_fcp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index 6fde2fa..774e7ac 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c @@ -48,7 +48,7 @@ struct kmem_cache *scsi_pkt_cachep; #define FC_SRB_CMD_SENT (1 << 0) /* cmd has been sent */ #define FC_SRB_RCV_STATUS (1 << 1) /* response has arrived */ #define FC_SRB_ABORT_PENDING (1 << 2) /* cmd abort sent to device */ -#define FC_SRB_ABORTED (1 << 3) /* abort acknowleged */ +#define FC_SRB_ABORTED (1 << 3) /* abort acknowledged */ #define FC_SRB_DISCONTIG (1 << 4) /* non-sequential data recvd */ #define FC_SRB_COMPL (1 << 5) /* fc_io_compl has been run */ #define FC_SRB_FCP_PROCESSING_TMO (1 << 6) /* timer function processing */ @@ -519,7 +519,7 @@ crc_err: * * Called after receiving a Transfer Ready data descriptor. * If the LLD is capable of sequence offload then send down the - * seq_blen ammount of data in single frame, otherwise send + * seq_blen amount of data in single frame, otherwise send * multiple frames of the maximum frame payload supported by * the target port. */ |
