diff options
author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 15:34:25 +0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 15:34:25 +0400 |
commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /include/asm-s390/cio.h | |
parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) | |
download | linux-f838bad1b3be8ca0c785ee0e0c570dfda74cf377.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-s390/cio.h')
-rw-r--r-- | include/asm-s390/cio.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-s390/cio.h b/include/asm-s390/cio.h index 123b557c3ff4..0818ecd30ca6 100644 --- 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 |