From 75975bb78bcdbb6d6abcaa3bc65636795c0f3602 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sat, 26 Jan 2008 14:11:19 +0100
Subject: [PATCH] --- yaml --- r: 77214 b: refs/heads/master c:
 5800266a7811afeba205e771dcad79023331011b h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-s390/cio.h    | 4 ++--
 trunk/include/asm-s390/dasd.h   | 2 +-
 trunk/include/asm-s390/qdio.h   | 2 +-
 trunk/include/asm-s390/zcrypt.h | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0e03aeb234e6..1162a2f209a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2e3bbac72d5a954bf60c5fabeb7c82ec310035e
+refs/heads/master: 5800266a7811afeba205e771dcad79023331011b
diff --git a/trunk/include/asm-s390/cio.h b/trunk/include/asm-s390/cio.h
index 2f08c16e44ad..123b557c3ff4 100644
--- a/trunk/include/asm-s390/cio.h
+++ b/trunk/include/asm-s390/cio.h
@@ -24,8 +24,8 @@
  * @fmt: format
  * @pfch: prefetch
  * @isic: initial-status interruption control
- * @alcc: adress-limit checking control
- * @ssi: supress-suspended interruption
+ * @alcc: address-limit checking control
+ * @ssi: suppress-suspended interruption
  * @zcc: zero condition code
  * @ectl: extended control
  * @pno: path not operational
diff --git a/trunk/include/asm-s390/dasd.h b/trunk/include/asm-s390/dasd.h
index 604f68fa6f56..3f002e13d024 100644
--- a/trunk/include/asm-s390/dasd.h
+++ b/trunk/include/asm-s390/dasd.h
@@ -105,7 +105,7 @@ typedef struct dasd_information_t {
 } dasd_information_t;
 
 /*
- * Read Subsystem Data - Perfomance Statistics
+ * Read Subsystem Data - Performance Statistics
  */ 
 typedef struct dasd_rssd_perf_stats_t {
 	unsigned char  invalid:1;
diff --git a/trunk/include/asm-s390/qdio.h b/trunk/include/asm-s390/qdio.h
index 74db1dc10a7d..4b8ff55f680e 100644
--- a/trunk/include/asm-s390/qdio.h
+++ b/trunk/include/asm-s390/qdio.h
@@ -184,7 +184,7 @@ struct qdr {
 #endif /* QDIO_32_BIT */
 	unsigned long qiba;             /* queue-information-block address */
 	unsigned int  res8;             /* reserved */
-	unsigned int  qkey    :  4;     /* queue-informatio-block key */
+	unsigned int  qkey    :  4;	/* queue-information-block key */
 	unsigned int  res9    : 28;     /* reserved */
 /*	union _qd {*/ /* why this? */
 		struct qdesfmt0 qdf0[126];
diff --git a/trunk/include/asm-s390/zcrypt.h b/trunk/include/asm-s390/zcrypt.h
index a5dada617751..f228f1b86877 100644
--- a/trunk/include/asm-s390/zcrypt.h
+++ b/trunk/include/asm-s390/zcrypt.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		 */