X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fs390%2Fnet%2Fiucv.h;h=198330217eff86c04af62dd4f7ee66cb04bf667c;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=5c0b29aea918c9b345adda9dc7ba4cc169008e4f;hpb=9bf4aaab3e101692164d49b7ca357651eb691cb6;p=linux-2.6.git

diff --git a/drivers/s390/net/iucv.h b/drivers/s390/net/iucv.h
index 5c0b29aea..198330217 100644
--- a/drivers/s390/net/iucv.h
+++ b/drivers/s390/net/iucv.h
@@ -63,7 +63,7 @@
 		debug_event(iucv_dbf_##name,level,(void*)(addr),len); \
 	} while (0)
 
-extern DEFINE_PER_CPU(char[256], iucv_dbf_txt_buf);
+DECLARE_PER_CPU(char[256], iucv_dbf_txt_buf);
 
 #define IUCV_DBF_TEXT_(name,level,text...)				\
 	do {								\
@@ -231,7 +231,10 @@ typedef struct {
 	uchar iptype;
 	u32 ipmsgid;
 	u32 iptrgcls;
-	uchar iprmmsg1[4];
+	union u2 {
+		u32 iprmmsg1_u32;
+		uchar iprmmsg1[4];
+	} ln1msg1;
 	union u1 {
 		u32 ipbfln1f;
 		uchar iprmmsg2[4];