Merge branch 'devel-stable' into devel

[sfrench/cifs-2.6.git] / include / linux / if_frad.h

diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index 80b3a1056a5f8526c8604341f0a5ddce3f35a5b0..191ee0869bc16d7f1df9c42e2b8e4b881c17cd28 100644 (file)
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -135,7 +135,7 @@ struct frhdr
    __be16 PID;
 
 #define IP_NLPID pad 
-} __attribute__((packed));
+} __packed;
 
 /* see RFC 1490 for the definition of the following */
 #define FRAD_I_UI              0x03