diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /include/scsi/libiscsi_tcp.h | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'include/scsi/libiscsi_tcp.h')
| -rw-r--r-- | include/scsi/libiscsi_tcp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/libiscsi_tcp.h b/include/scsi/libiscsi_tcp.h index e6b9fd2eea3..ac0cc1d925e 100644 --- a/include/scsi/libiscsi_tcp.h +++ b/include/scsi/libiscsi_tcp.h | |||
| @@ -52,7 +52,7 @@ struct iscsi_segment { | |||
| 52 | iscsi_segment_done_fn_t *done; | 52 | iscsi_segment_done_fn_t *done; |
| 53 | }; | 53 | }; |
| 54 | 54 | ||
| 55 | /* Socket connection recieve helper */ | 55 | /* Socket connection receive helper */ |
| 56 | struct iscsi_tcp_recv { | 56 | struct iscsi_tcp_recv { |
| 57 | struct iscsi_hdr *hdr; | 57 | struct iscsi_hdr *hdr; |
| 58 | struct iscsi_segment segment; | 58 | struct iscsi_segment segment; |