Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / asm-s390 / qdio.h

diff --git a/include/asm-s390/qdio.h b/include/asm-s390/qdio.h
index 7bc15f0231dbeaa52872f2973692e5ddf4339f69..4b8ff55f680e4d6e26183d2da148c545054116d6 100644 (file)
--- a/include/asm-s390/qdio.h
+++ b/include/asm-s390/qdio.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm/qdio.h
+ * linux/include/asm-s390/qdio.h
  *
  * Linux for S/390 QDIO base support, Hipersocket base support
  * version 2
@@ -11,8 +11,6 @@
 #ifndef __QDIO_H__
 #define __QDIO_H__
 
-#define VERSION_QDIO_H "$Revision: 1.57 $"
-
 /* note, that most of the typedef's are from ingo. */
 
 #include <linux/interrupt.h>
@@ -36,6 +34,7 @@
 #define QDIO_QETH_QFMT 0
 #define QDIO_ZFCP_QFMT 1
 #define QDIO_IQDIO_QFMT 2
+#define QDIO_IQDIO_QFMT_ASYNCH 3
 
 struct qdio_buffer_element{
        unsigned int flags;
@@ -121,6 +120,7 @@ extern unsigned long qdio_get_status(int irq);
 #define QDIO_FLAG_NO_INPUT_INTERRUPT_CONTEXT 0x08 /* no effect on
                                                     adapter interrupts */
 #define QDIO_FLAG_DONT_SIGA 0x10
+#define QDIO_FLAG_PCI_OUT   0x20
 
 extern int do_QDIO(struct ccw_device*, unsigned int flags, 
                   unsigned int queue_number,
@@ -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];