diff options
| author | Cornelia Huck | 2005-09-04 00:58:01 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-05 09:06:28 +0200 |
| commit | 4c24da79e29537f0e240a331220a1c46cb9bc085 (patch) | |
| tree | c71f0c6433274a5f029884f630a3a03c7bba8a30 /drivers/s390/cio/device_fsm.c | |
| parent | [PATCH] s390: 64 bit diag250 support (diff) | |
| download | kernel-qcow2-linux-4c24da79e29537f0e240a331220a1c46cb9bc085.tar.gz kernel-qcow2-linux-4c24da79e29537f0e240a331220a1c46cb9bc085.tar.xz kernel-qcow2-linux-4c24da79e29537f0e240a331220a1c46cb9bc085.zip | |
[PATCH] s390: reIPL fix and extern/static inline
Common i/o layer changes:
- Collect the irb at the correct subchannel when waiting for the clear
interrupt during subchannel cleaning befor reIPL - don't stop at the first
interrupt that comes in.
- Change "extern __inline__" to "static inline".
- Remove unneeded qdio includes.
Signed-off-by: Cornelia Huck <cohuck@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/s390/cio/device_fsm.c')
| -rw-r--r-- | drivers/s390/cio/device_fsm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c index ee7a05e0c3ba..fbe4202a3f6f 100644 --- a/drivers/s390/cio/device_fsm.c +++ b/drivers/s390/cio/device_fsm.c @@ -13,7 +13,7 @@ #include <linux/init.h> #include <asm/ccwdev.h> -#include <asm/qdio.h> +#include <asm/cio.h> #include "cio.h" #include "cio_debug.h" @@ -21,7 +21,6 @@ #include "device.h" #include "chsc.h" #include "ioasm.h" -#include "qdio.h" int device_is_online(struct subchannel *sch) |