From e62da309b7d6fc2710a17e8348d323a5c1448250 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 18 Jun 2010 10:30:21 -0700
Subject: [PATCH] --- yaml --- r: 205599 b: refs/heads/master c:
 afb97d9a265f6001411df43d3ea523338c73c83f h: refs/heads/master i:   205597:
 7a2c5785b0e5bfd6f64aeef58d804713c5dad0b9   205595:
 216ed681e58cca103b06d3d17d8b4c4a098ba45d   205591:
 7aa563b5c2be4b52a12dab6f085b0234d9c00a95   205583:
 8aae31f36d8fcbe9a917c86fd6d1fced0f722b01   205567:
 032564fac70fef24449a248d6d831043d44db3b5 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/staging/vt6655/device.h | 2 +-
 trunk/drivers/staging/vt6655/iwctl.c  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 71ea598e0fc7..1b4ffcbb2bdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf160bc9269fecba0a10e9957e8591fcc293dddf
+refs/heads/master: afb97d9a265f6001411df43d3ea523338c73c83f
diff --git a/trunk/drivers/staging/vt6655/device.h b/trunk/drivers/staging/vt6655/device.h
index 9e236f745ce5..bad32562a7fb 100644
--- a/trunk/drivers/staging/vt6655/device.h
+++ b/trunk/drivers/staging/vt6655/device.h
@@ -423,7 +423,7 @@ typedef struct __device_info {
 
     CHIP_TYPE                   chip_id;
 
-    u32                         PortOffset;
+    unsigned long               PortOffset;
     DWORD                       dwIsr;
     u32                         memaddr;
     u32                         ioaddr;
diff --git a/trunk/drivers/staging/vt6655/iwctl.c b/trunk/drivers/staging/vt6655/iwctl.c
index a2b2bc5d4341..f3545071151c 100644
--- a/trunk/drivers/staging/vt6655/iwctl.c
+++ b/trunk/drivers/staging/vt6655/iwctl.c
@@ -116,7 +116,7 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
 	pDevice->wstats.discard.nwid = 0;
 	pDevice->wstats.discard.code = 0;
 	pDevice->wstats.discard.fragment = 0;
-	pDevice->wstats.discard.retries = (u32)pDevice->scStatistic.dwTsrErr;
+	pDevice->wstats.discard.retries = (unsigned long)pDevice->scStatistic.dwTsrErr;
 	pDevice->wstats.discard.misc = 0;
 	pDevice->wstats.miss.beacon = 0;