Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / include / asm-s390 / zcrypt.h

diff --git a/include/asm-s390/zcrypt.h b/include/asm-s390/zcrypt.h
index a5dada6177514fc650ea27a5cdf556d6702e233c..00d3bbd44117fe2093abe6dfca8ec6d6bb3e93cf 100644 (file)
--- a/include/asm-s390/zcrypt.h
+++ b/include/asm-s390/zcrypt.h
@@ -29,7 +29,7 @@
 
 #define ZCRYPT_VERSION 2
 #define ZCRYPT_RELEASE 1
-#define ZCRYPT_VARIANT 0
+#define ZCRYPT_VARIANT 1
 
 #include <linux/ioctl.h>
 #include <linux/compiler.h>
@@ -117,7 +117,7 @@ struct CPRBX {
        unsigned char   padx004[16 - sizeof (char *)];
        unsigned char * req_extb;       /* request extension block 'addr'*/
        unsigned char   padx005[16 - sizeof (char *)];
-       unsigned char * rpl_extb;       /* reply extension block 'addres'*/
+       unsigned char * rpl_extb;       /* reply extension block 'address'*/
        unsigned short  ccp_rtcode;     /* server return code            */
        unsigned short  ccp_rscode;     /* server reason code            */
        unsigned int    mac_data_len;   /* Mac Data Length               */