git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
include
/
asm-s390
/
qdio.h
diff --git
a/include/asm-s390/qdio.h
b/include/asm-s390/qdio.h
index
7bc15f0
..
127f72e
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
*
* Linux for S/390 QDIO base support, Hipersocket base support
* version 2
@@
-11,8
+11,6
@@
#ifndef __QDIO_H__
#define __QDIO_H__
#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>
/* 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_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;
struct qdio_buffer_element{
unsigned int flags;