From 5d0a26b781a68a5dc428fc49154a4bc644d8a183 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 27 Jul 2010 22:24:37 -0700
Subject: [PATCH] --- yaml --- r: 203781 b: refs/heads/master c:
 bd280635825a2b3981da63a54e38de97e87231b3 h: refs/heads/master i:   203779:
 d8a4f074e548e09ea918165a699d165d1a01d9fd v: v3

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

diff --git a/[refs] b/[refs]
index d4f31f431e55..b7f85884d502 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba01877f56c3244b21746d3f1537f7647ed97984
+refs/heads/master: bd280635825a2b3981da63a54e38de97e87231b3
diff --git a/trunk/drivers/net/ks8842.c b/trunk/drivers/net/ks8842.c
index 3fe38c787f29..928b2b83cef5 100644
--- a/trunk/drivers/net/ks8842.c
+++ b/trunk/drivers/net/ks8842.c
@@ -919,7 +919,7 @@ static void ks8842_dealloc_dma_bufs(struct ks8842_adapter *adapter)
 
 static bool ks8842_dma_filter_fn(struct dma_chan *chan, void *filter_param)
 {
-	return chan->chan_id == (int)filter_param;
+	return chan->chan_id == (long)filter_param;
 }
 
 static int ks8842_alloc_dma_bufs(struct net_device *netdev)
@@ -938,7 +938,7 @@ static int ks8842_alloc_dma_bufs(struct net_device *netdev)
 	sg_init_table(&tx_ctl->sg, 1);
 
 	tx_ctl->chan = dma_request_channel(mask, ks8842_dma_filter_fn,
-		(void *)tx_ctl->channel);
+					   (void *)(long)tx_ctl->channel);
 	if (!tx_ctl->chan) {
 		err = -ENODEV;
 		goto err;
@@ -961,7 +961,7 @@ static int ks8842_alloc_dma_bufs(struct net_device *netdev)
 	}
 
 	rx_ctl->chan = dma_request_channel(mask, ks8842_dma_filter_fn,
-		(void *)rx_ctl->channel);
+					   (void *)(long)rx_ctl->channel);
 	if (!rx_ctl->chan) {
 		err = -ENODEV;
 		goto err;