Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

[linux-block.git] / include / asm-s390 / cio.h

diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h
index 123b557c3ff4d19c29b42bd1dec2f570787cef36..0818ecd30ca6d1b84536ac16ae87fc0f9fee6bcb 100644 (file)
--- a/include/asm-s390/cio.h
+++ b/include/asm-s390/cio.h
@@ -397,6 +397,10 @@ struct cio_iplinfo {
 
 extern int cio_get_iplinfo(struct cio_iplinfo *iplinfo);
 
+/* Function from drivers/s390/cio/chsc.c */
+int chsc_sstpc(void *page, unsigned int op, u16 ctrl);
+int chsc_sstpi(void *page, void *result, size_t size);
+
 #endif
 
 #endif