diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:57:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-12 12:57:44 -0500 |
| commit | ebaf0c6032f525ddb0158fb59848d41899dce8cd (patch) | |
| tree | c6c19d30f3621725f61941d1de967c4351fb22f7 /include/asm-s390/ccwdev.h | |
| parent | ee9b6d61a2a43c5952eb43283f8db284a4e70b8a (diff) | |
| parent | 022ae414daadb718130679e4eacc105521f11ec7 (diff) | |
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] remove __io_virt and mmiowb.
[S390] cio: use ARRAY_SIZE in device_id.c
[S390] cio: Fixup interface for setting options on ccw devices.
[S390] smp_call_function/smp_call_function_on locking.
Diffstat (limited to 'include/asm-s390/ccwdev.h')
| -rw-r--r-- | include/asm-s390/ccwdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-s390/ccwdev.h b/include/asm-s390/ccwdev.h index 58c70acffc73..cfc81533b9ba 100644 --- a/include/asm-s390/ccwdev.h +++ b/include/asm-s390/ccwdev.h | |||
| @@ -110,7 +110,9 @@ extern void ccw_driver_unregister (struct ccw_driver *driver); | |||
| 110 | 110 | ||
| 111 | struct ccw1; | 111 | struct ccw1; |
| 112 | 112 | ||
| 113 | extern int ccw_device_set_options_mask(struct ccw_device *, unsigned long); | ||
| 113 | extern int ccw_device_set_options(struct ccw_device *, unsigned long); | 114 | extern int ccw_device_set_options(struct ccw_device *, unsigned long); |
| 115 | extern void ccw_device_clear_options(struct ccw_device *, unsigned long); | ||
| 114 | 116 | ||
| 115 | /* Allow for i/o completion notification after primary interrupt status. */ | 117 | /* Allow for i/o completion notification after primary interrupt status. */ |
| 116 | #define CCWDEV_EARLY_NOTIFICATION 0x0001 | 118 | #define CCWDEV_EARLY_NOTIFICATION 0x0001 |