diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-15 10:22:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-15 10:22:22 -0800 |
| commit | 701dfbe71903413d10caf2790259bccbabbedcf5 (patch) | |
| tree | 6d87a6d1ad2bc4672684197aa1788890bead0d1e /include | |
| parent | d1526e2cda64d5a1de56aef50bad9e5df14245c2 (diff) | |
| parent | e42734e270b9e5ada83188d73b733533ce11ee4a (diff) | |
| download | linux-701dfbe71903413d10caf2790259bccbabbedcf5.tar.bz2 | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] cio: css_register_subchannel race.
[S390] Save prefix register for dump on panic
[S390] Fix reboot hang
[S390] Fix reboot hang on LPARs
[S390] sclp_cpi module license.
[S390] zcrypt: module unload fixes.
[S390] Hipersocket multicast queue: make sure outbound handler is called
[S390] hypfs fixes
[S390] update default configuration
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/qdio.h | 1 | ||||
| -rw-r--r-- | include/asm-s390/reset.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-s390/qdio.h b/include/asm-s390/qdio.h index 7189c79bc673..127f72e77419 100644 --- a/include/asm-s390/qdio.h +++ b/include/asm-s390/qdio.h @@ -34,6 +34,7 @@ #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; diff --git a/include/asm-s390/reset.h b/include/asm-s390/reset.h index 9b439cf67800..532e65a2aafc 100644 --- a/include/asm-s390/reset.h +++ b/include/asm-s390/reset.h @@ -19,5 +19,6 @@ extern void register_reset_call(struct reset_call *reset); extern void unregister_reset_call(struct reset_call *reset); extern void s390_reset_system(void); extern void (*s390_reset_mcck_handler)(void); +extern void (*s390_reset_pgm_handler)(void); #endif /* _ASM_S390_RESET_H */ |