summaryrefslogtreecommitdiff
path: root/arch/s390/include/asm/crw.h
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-08-04 11:59:13 (GMT)
committerMichal Marek <mmarek@suse.cz>2010-08-04 11:59:13 (GMT)
commit772320e84588dcbe1600ffb83e5f328f2209ac2a (patch)
treea7de21b79340aeaa17c58126f6b801b82c77b53a /arch/s390/include/asm/crw.h
parent1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff)
parent9fe6206f400646a2322096b56c59891d530e8d51 (diff)
downloadlinux-fsl-qoriq-772320e84588dcbe1600ffb83e5f328f2209ac2a.tar.xz
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts: arch/powerpc/Makefile
Diffstat (limited to 'arch/s390/include/asm/crw.h')
-rw-r--r--arch/s390/include/asm/crw.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/crw.h b/arch/s390/include/asm/crw.h
index 2185a6d..749a97e 100644
--- a/arch/s390/include/asm/crw.h
+++ b/arch/s390/include/asm/crw.h
@@ -32,6 +32,7 @@ typedef void (*crw_handler_t)(struct crw *, struct crw *, int);
extern int crw_register_handler(int rsc, crw_handler_t handler);
extern void crw_unregister_handler(int rsc);
extern void crw_handle_channel_report(void);
+void crw_wait_for_channel_report(void);
#define NR_RSCS 16