---

yaml --- r: 279420 b: refs/heads/master c: 853d5dc h: refs/heads/master v: v3
git-mirror · Jan 4, 2012 · c5092eb · c5092eb
1 parent 755a5f3
commit c5092eb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1477637967d0d8db3083bacb241c796c3c4f23b
+refs/heads/master: 853d5dc95b41babb7001934becad9c944738d8e3
diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c
@@ -173,7 +173,7 @@ struct r6040_descriptor {
 	struct r6040_descriptor *vndescp;	/* 14-17 */
 	struct sk_buff *skb_ptr;	/* 18-1B */
 	u32	rev2;			/* 1C-1F */
-} __attribute__((aligned(32)));
+} __aligned(32);
 
 struct r6040_private {
 	spinlock_t lock;		/* driver lock */