Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 251ebd7a7d3a..b6375861cb37 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -115,6 +115,7 @@ struct ccw_device_private {
  * Currently, we only care about I/O subchannels (type 0), these
  * have a ccw_device connected to them.
  */
+struct subchannel;
 struct css_driver {
         unsigned int subchannel_type;
         struct device_driver drv;
@@ -122,6 +123,9 @@ struct css_driver {
         int (*notify)(struct device *, int);
         void (*verify)(struct device *);
         void (*termination)(struct device *);
+        int (*probe)(struct subchannel *);
+        int (*remove)(struct subchannel *);
+        void (*shutdown)(struct subchannel *);
 };
 
 /*
@@ -143,7 +147,7 @@ extern int for_each_subchannel(int(*fn)(struct subchannel_id, void *), void *);
 struct channel_subsystem {
         u8 cssid;
         int valid;
-        struct channel_path *chps[__MAX_CHPID];
+        struct channel_path *chps[__MAX_CHPID + 1];
         struct device device;
         struct pgid global_pgid;
 };