diff --git a/[refs] b/[refs]
index 08456ab08c51..d81a2a98861e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0f76d6869adad1f3757d102af47508be0642949
+refs/heads/master: cbe6ab4e11603e426e01c6349cd5643f3a287ba4
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-bus.h b/trunk/drivers/net/wireless/iwlwifi/iwl-bus.h
index 30965e0e8ab4..7d56cbc4a0b8 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-bus.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-bus.h
@@ -133,7 +133,7 @@ struct iwl_bus {
 
 	/* pointer to bus specific struct */
 	/*Ensure that this pointer will always be aligned to sizeof pointer */
-	char bus_specific[0] __attribute__((__aligned__(sizeof(void *))));
+	char bus_specific[0] __aligned(sizeof(void *));
 };
 
 /*****************************************************
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h b/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
index cc7a3cfb5f24..f42328605356 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-trans.h
@@ -347,7 +347,7 @@ struct iwl_trans {
 
 	/* pointer to trans specific struct */
 	/*Ensure that this pointer will always be aligned to sizeof pointer */
-	char trans_specific[0] __attribute__((__aligned__(sizeof(void *))));
+	char trans_specific[0] __aligned(sizeof(void *));
 };
 
 static inline int iwl_trans_start_hw(struct iwl_trans *trans)