diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 00:11:26 -0400 |
| commit | c602c65b2f81d14456771d1e3f15d1381f4b7efa (patch) | |
| tree | f1f833c8dd6c1519eeb101be32f7fe54a9605af5 /include/scsi/iscsi_if.h | |
| parent | 3834f47291df475be3f0f0fb7ccaa098967cc054 (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'linus' into sfi-release
Conflicts:
arch/x86/kernel/setup.c
drivers/acpi/power.c
init/main.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/scsi/iscsi_if.h')
| -rw-r--r-- | include/scsi/iscsi_if.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/scsi/iscsi_if.h b/include/scsi/iscsi_if.h index 4426f00da5ff..d67dda2b6aa0 100644 --- a/include/scsi/iscsi_if.h +++ b/include/scsi/iscsi_if.h | |||
| @@ -262,6 +262,7 @@ enum iscsi_err { | |||
| 262 | ISCSI_ERR_NO_SCSI_CMD = ISCSI_ERR_BASE + 17, | 262 | ISCSI_ERR_NO_SCSI_CMD = ISCSI_ERR_BASE + 17, |
| 263 | ISCSI_ERR_INVALID_HOST = ISCSI_ERR_BASE + 18, | 263 | ISCSI_ERR_INVALID_HOST = ISCSI_ERR_BASE + 18, |
| 264 | ISCSI_ERR_XMIT_FAILED = ISCSI_ERR_BASE + 19, | 264 | ISCSI_ERR_XMIT_FAILED = ISCSI_ERR_BASE + 19, |
| 265 | ISCSI_ERR_TCP_CONN_CLOSE = ISCSI_ERR_BASE + 20, | ||
| 265 | }; | 266 | }; |
| 266 | 267 | ||
| 267 | /* | 268 | /* |