5 files changed, 48 insertions, 48 deletions

diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h
index 26c545fa223b..1b85ce166af8 100644
--- a/drivers/isdn/hisax/hisax.h
+++ b/drivers/isdn/hisax/hisax.h
@@ -396,17 +396,17 @@ struct isar_hw {
 
 struct hdlc_stat_reg {
 #ifdef __BIG_ENDIAN
-        u_char fill __attribute__((packed));
-        u_char mode __attribute__((packed));
-        u_char xml  __attribute__((packed));
-        u_char cmd  __attribute__((packed));
+        u_char fill;
+        u_char mode;
+        u_char xml;
+        u_char cmd;
 #else
-        u_char cmd  __attribute__((packed));
-        u_char xml  __attribute__((packed));
-        u_char mode __attribute__((packed));
-        u_char fill __attribute__((packed));
+        u_char cmd;
+        u_char xml;
+        u_char mode;
+        u_char fill;
 #endif
-};
+} __attribute__((packed));
 
 struct hdlc_hw {
         union {
diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.h b/drivers/isdn/hisax/hisax_fcpcipnp.h
index bd8a22e4d6a2..21fbcedf3a94 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.h
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.h
@@ -12,17 +12,17 @@ enum {
 
 struct hdlc_stat_reg {
 #ifdef __BIG_ENDIAN
-        u_char fill __attribute__((packed));
-        u_char mode __attribute__((packed));
-        u_char xml  __attribute__((packed));
-        u_char cmd  __attribute__((packed));
+        u_char fill;
+        u_char mode;
+        u_char xml;
+        u_char cmd;
 #else
-        u_char cmd  __attribute__((packed));
-        u_char xml  __attribute__((packed));
-        u_char mode __attribute__((packed));
-        u_char fill __attribute__((packed));
+        u_char cmd;
+        u_char xml;
+        u_char mode;
+        u_char fill;
 #endif
-};
+} __attribute__((packed));
 
 struct fritz_bcs {
         struct hisax_b_if b_if;
diff --git a/drivers/net/3c527.h b/drivers/net/3c527.h
index c10f009ce9b6..53b5b071df08 100644
--- a/drivers/net/3c527.h
+++ b/drivers/net/3c527.h
@@ -32,43 +32,43 @@
 
 struct mc32_mailbox
 {
-        u16     mbox __attribute((packed));
-        u16     data[1] __attribute((packed));
-};
+        u16 mbox;
+        u16 data[1];
+} __attribute((packed));
 
 struct skb_header
 {
-        u8      status __attribute((packed));
-        u8      control __attribute((packed));
-        u16     next __attribute((packed));     /* Do not change! */
-        u16     length __attribute((packed));
-        u32     data __attribute((packed));
-};
+        u8 status;
+        u8 control;
+        u16 next;       /* Do not change! */
+        u16 length;
+        u32 data;
+} __attribute((packed));
 
 struct mc32_stats
 {
         /* RX Errors */
-        u32     rx_crc_errors       __attribute((packed));      
-        u32     rx_alignment_errors  __attribute((packed));     
-        u32     rx_overrun_errors    __attribute((packed));
-        u32     rx_tooshort_errors  __attribute((packed));
-        u32     rx_toolong_errors   __attribute((packed));
-        u32     rx_outofresource_errors  __attribute((packed)); 
+        u32 rx_crc_errors;
+        u32 rx_alignment_errors;
+        u32 rx_overrun_errors;
+        u32 rx_tooshort_errors;
+        u32 rx_toolong_errors;
+        u32 rx_outofresource_errors;
 
-        u32     rx_discarded   __attribute((packed));  /* via card pattern match filter */ 
+        u32 rx_discarded;  /* via card pattern match filter */
 
         /* TX Errors */
-        u32     tx_max_collisions __attribute((packed)); 
-        u32     tx_carrier_errors __attribute((packed)); 
-        u32     tx_underrun_errors __attribute((packed)); 
-        u32     tx_cts_errors     __attribute((packed)); 
-        u32     tx_timeout_errors __attribute((packed)) ;
+        u32 tx_max_collisions;
+        u32 tx_carrier_errors;
+        u32 tx_underrun_errors;
+        u32 tx_cts_errors;
+        u32 tx_timeout_errors;
         
         /* various cruft */
-        u32     dataA[6] __attribute((packed));   
-        u16     dataB[5] __attribute((packed));   
-        u32     dataC[14] __attribute((packed));        
-};
+        u32 dataA[6];
+        u16 dataB[5];
+        u32 dataC[14];
+} __attribute((packed));
 
 #define STATUS_MASK     0x0F
 #define COMPLETED       (1<<7)
diff --git a/drivers/net/irda/vlsi_ir.h b/drivers/net/irda/vlsi_ir.h
index 741aecc655df..a82a4ba8de4f 100644
--- a/drivers/net/irda/vlsi_ir.h
+++ b/drivers/net/irda/vlsi_ir.h
@@ -577,8 +577,8 @@ struct ring_descr_hw {
                 struct {
                         u8              addr_res[3];
                         volatile u8     status;         /* descriptor status */
-                } rd_s __attribute__((packed));
-        } rd_u __attribute((packed));
+                } __attribute__((packed)) rd_s;
+        } __attribute((packed)) rd_u;
 } __attribute__ ((packed));
 
 #define rd_addr         rd_u.addr
diff --git a/drivers/net/wan/sdla.c b/drivers/net/wan/sdla.c
index 036adc4f8ba7..22e794071cf4 100644
--- a/drivers/net/wan/sdla.c
+++ b/drivers/net/wan/sdla.c
@@ -329,9 +329,9 @@ static int sdla_cpuspeed(struct net_device *dev, struct ifreq *ifr)
 
 struct _dlci_stat 
 {
-        short dlci              __attribute__((packed));
-        char  flags             __attribute__((packed));
-};
+        short dlci;
+        char  flags;
+} __attribute__((packed));
 
 struct _frad_stat 
 {