From 74e65b7a02f33e1950ac6ed328b2bb7c66268579 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Fri, 16 May 2008 21:19:21 +0100
Subject: [PATCH] --- yaml --- r: 97335 b: refs/heads/master c:
 24c28edc5a1b1dc4677eb13408ff3492d65df159 h: refs/heads/master i:   97333:
 503aace0057e5b59e1ad79ba341edee0fe18b1e2   97331:
 d76aab76fa499bdcf361aa9d80b3112e392fef83   97327:
 4274890e64c6f8e852aeee43922189ac5d6bbd0e v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/sfc/falcon_hwdefs.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a20ad1acde12..ff9a59e5912c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f8135ca7224d98c2de43edde69f4e6bec12da0e
+refs/heads/master: 24c28edc5a1b1dc4677eb13408ff3492d65df159
diff --git a/trunk/drivers/net/sfc/falcon_hwdefs.h b/trunk/drivers/net/sfc/falcon_hwdefs.h
index 06e2d68fc3d1..6d003114eeab 100644
--- a/trunk/drivers/net/sfc/falcon_hwdefs.h
+++ b/trunk/drivers/net/sfc/falcon_hwdefs.h
@@ -1125,7 +1125,7 @@ struct falcon_nvconfig_board_v2 {
 	u8 port1_phy_type;
 	__le16 asic_sub_revision;
 	__le16 board_revision;
-} __attribute__ ((packed));
+} __packed;
 
 #define NVCONFIG_BASE 0x300
 #define NVCONFIG_BOARD_MAGIC_NUM 0xFA1C
@@ -1144,6 +1144,6 @@ struct falcon_nvconfig {
 	__le16 board_struct_ver;
 	__le16 board_checksum;
 	struct falcon_nvconfig_board_v2 board_v2;
-} __attribute__ ((packed));
+} __packed;
 
 #endif /* EFX_FALCON_HWDEFS_H */