Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[cascardo/linux.git] / include / asm-s390 / qdio.h

diff --git a/include/asm-s390/qdio.h b/include/asm-s390/qdio.h
index 74db1dc..4b8ff55 100644 (file)
--- a/include/asm-s390/qdio.h
+++ b/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];