---

yaml --- r: 205599 b: refs/heads/master c: afb97d9 h: refs/heads/master i: 205597: 7a2c578 205595: 216ed68 205591: 7aa563b 205583: 8aae31f 205567: 032564f v: v3
git-mirror · Jun 18, 2010 · e62da30 · e62da30
1 parent 79a01f0
commit e62da30
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;