linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index e210f89..b637586 100644 (file)
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -1,7 +1,6 @@
 #ifndef _CSS_H
 #define _CSS_H
 
-#include <linux/mutex.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
 
@@ -45,11 +44,11 @@ struct pgid {
        union {
                __u8 fc;        /* SPID function code */
                struct path_state ps;   /* SNID path state */
-       } __attribute__ ((packed)) inf;
+       } inf;
        union {
                __u32 cpu_addr  : 16;   /* CPU address */
                struct extended_cssid ext_cssid;
-       } __attribute__ ((packed)) pgid_high;
+       } pgid_high;
        __u32 cpu_id    : 24;   /* CPU identification */
        __u32 cpu_model : 16;   /* CPU model */
        __u32 tod_high;         /* high word TOD clock */
@@ -151,11 +150,6 @@ struct channel_subsystem {
        struct channel_path *chps[__MAX_CHPID + 1];
        struct device device;
        struct pgid global_pgid;
-       struct mutex mutex;
-       /* channel measurement related */
-       int cm_enabled;
-       void *cub_addr1;
-       void *cub_addr2;
 };
 #define to_css(dev) container_of(dev, struct channel_subsystem, device)