X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fs390%2Fcio%2Fcss.h;h=b6375861cb3766188d85240e823828abca0e526c;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=e210f89a24499c65f9bedea44df54d3e299c96d4;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index e210f89a2..b6375861c 100644
--- 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)