Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / cio.h

diff --git a/drivers/s390/cio/cio.h b/drivers/s390/cio/cio.h
index 0ca987344e07183f6b1d9bbbae5c040dc924bed9..4541c1af4b666aac7152bcbf9ef593a46074a0ef 100644 (file)
--- a/drivers/s390/cio/cio.h
+++ b/drivers/s390/cio/cio.h
@@ -2,6 +2,7 @@
 #define S390_CIO_H
 
 #include "schid.h"
+#include <linux/mutex.h>
 
 /*
  * where we put the ssd info
@@ -87,7 +88,7 @@ struct orb {
 struct subchannel {
        struct subchannel_id schid;
        spinlock_t lock;        /* subchannel lock */
-
+       struct mutex reg_mutex;
        enum {
                SUBCHANNEL_TYPE_IO = 0,
                SUBCHANNEL_TYPE_CHSC = 1,