Merge commit 'v2.6.27-rc6' into x86/cleanups

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

diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 3ec3dc5a1e5edd2a3e7030d2a37983ea33cc272a..57ebf120f825b00f68ee934e9e9a26324beedd09 100644 (file)
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -9,8 +9,7 @@
 
 #include <asm/cio.h>
 #include <asm/chpid.h>
-
-#include "schid.h"
+#include <asm/schid.h>
 
 /*
  * path grouping stuff
@@ -59,6 +58,7 @@ struct pgid {
 } __attribute__ ((packed));
 
 struct subchannel;
+struct chp_link;
 /**
  * struct css_driver - device driver for subchannels
  * @owner: owning module
@@ -74,10 +74,10 @@ struct subchannel;
  */
 struct css_driver {
        struct module *owner;
-       unsigned int subchannel_type;
+       struct css_device_id *subchannel_type;
        struct device_driver drv;
        void (*irq)(struct subchannel *);
-       int (*chp_event)(struct subchannel *, void *, int);
+       int (*chp_event)(struct subchannel *, struct chp_link *, int);
        int (*sch_event)(struct subchannel *, int);
        int (*probe)(struct subchannel *);
        int (*remove)(struct subchannel *);