From 95d831b92c68efa98202e896a7c5e93c6fe97ccb Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 25 May 2010 16:24:03 -0700
Subject: [PATCH] --- yaml --- r: 198627 b: refs/heads/master c:
 f925b1303e0672effc78547353bd2ddfe11f5b5f h: refs/heads/master i:   198625:
 c0044eb48f0b2b8e31de4aac28e014cf84227e74   198623:
 583e24bcc4277e5d280d3d7ecfb77afa81cb9968 v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/usb/asix.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index e619f1946b32..fa48c8dc9ebc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd131e76e562fa0c6f9dd53130e8d08d39a0b62c
+refs/heads/master: f925b1303e0672effc78547353bd2ddfe11f5b5f
diff --git a/trunk/drivers/net/usb/asix.c b/trunk/drivers/net/usb/asix.c
index 31b73310ec77..1f802e90474c 100644
--- a/trunk/drivers/net/usb/asix.c
+++ b/trunk/drivers/net/usb/asix.c
@@ -322,7 +322,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 		size = (u16) (header & 0x0000ffff);
 
 		if ((skb->len) - ((size + 1) & 0xfffe) == 0) {
-			u8 alignment = (u32)skb->data & 0x3;
+			u8 alignment = (unsigned long)skb->data & 0x3;
 			if (alignment != 0x2) {
 				/*
 				 * not 16bit aligned so use the room provided by
@@ -351,7 +351,7 @@ static int asix_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 		}
 		ax_skb = skb_clone(skb, GFP_ATOMIC);
 		if (ax_skb) {
-			u8 alignment = (u32)packet & 0x3;
+			u8 alignment = (unsigned long)packet & 0x3;
 			ax_skb->len = size;
 
 			if (alignment != 0x2) {