Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/include/asm-ia64/sn/xp.h b/include/asm-ia64/sn/xp.h
index 49faf8f26430..203945ae034e 100644
--- a/include/asm-ia64/sn/xp.h
+++ b/include/asm-ia64/sn/xp.h
@@ -227,7 +227,9 @@ enum xpc_retval {
 
         xpcOpenCloseError,      /* 50: channel open/close protocol error */
 
-        xpcUnknownReason        /* 51: unknown reason -- must be last in list */
+        xpcDisconnected,        /* 51: channel disconnected (closed) */
+
+        xpcUnknownReason        /* 52: unknown reason -- must be last in list */
 };