diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
| commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
| tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /drivers/s390/cio/cio.h | |
| parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
| parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/s390/cio/cio.h')
| -rw-r--r-- | drivers/s390/cio/cio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h index 0ca987344e07..4541c1af4b66 100644 --- a/drivers/s390/cio/cio.h +++ b/drivers/s390/cio/cio.h | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #define S390_CIO_H | 2 | #define S390_CIO_H |
| 3 | 3 | ||
| 4 | #include "schid.h" | 4 | #include "schid.h" |
| 5 | #include <linux/mutex.h> | ||
| 5 | 6 | ||
| 6 | /* | 7 | /* |
| 7 | * where we put the ssd info | 8 | * where we put the ssd info |
| @@ -87,7 +88,7 @@ struct orb { | |||
| 87 | struct subchannel { | 88 | struct subchannel { |
| 88 | struct subchannel_id schid; | 89 | struct subchannel_id schid; |
| 89 | spinlock_t lock; /* subchannel lock */ | 90 | spinlock_t lock; /* subchannel lock */ |
| 90 | 91 | struct mutex reg_mutex; | |
| 91 | enum { | 92 | enum { |
| 92 | SUBCHANNEL_TYPE_IO = 0, | 93 | SUBCHANNEL_TYPE_IO = 0, |
| 93 | SUBCHANNEL_TYPE_CHSC = 1, | 94 | SUBCHANNEL_TYPE_CHSC = 1, |