From 3c3aa952d7ec3de3b7af2d7eb1f799269daddb91 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 7 Jul 2010 18:23:19 -0700
Subject: [PATCH] --- yaml --- r: 203416 b: refs/heads/master c:
 5cf3e03457aa905f17f9765702850316b69aad1e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a429bf52eb61..45ab21ca426f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a038716957d3888a595014a660b1db1f28946f62
+refs/heads/master: 5cf3e03457aa905f17f9765702850316b69aad1e
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
index db519a81e53a..5bb6bb74c40e 100644
--- a/trunk/drivers/net/ethoc.c
+++ b/trunk/drivers/net/ethoc.c
@@ -286,7 +286,7 @@ static inline void ethoc_disable_rx_and_tx(struct ethoc *dev)
 	ethoc_write(dev, MODER, mode);
 }
 
-static int ethoc_init_ring(struct ethoc *dev, void* mem_start)
+static int ethoc_init_ring(struct ethoc *dev, unsigned long mem_start)
 {
 	struct ethoc_bd bd;
 	int i;
@@ -670,7 +670,7 @@ static int ethoc_open(struct net_device *dev)
 	if (ret)
 		return ret;
 
-	ethoc_init_ring(priv, (void*)dev->mem_start);
+	ethoc_init_ring(priv, dev->mem_start);
 	ethoc_reset(priv);
 
 	if (netif_queue_stopped(dev)) {