The following commit has been merged in the linux branch: commit 4ce22537a28eeb6a29a2b4d1049c703a80c25bd1 Author: Alan Cox alan@linux.intel.com Date: Mon Oct 12 05:27:55 2009 +0000

ethoc: fix warning from 32bit build

drivers/net/ethoc.c: In function ‘ethoc_open’: drivers/net/ethoc.c:667: warning: comparison of distinct pointer types lacks a cast

Signed-off-by: Alan Cox alan@linux.intel.com Signed-off-by: David S. Miller davem@davemloft.net

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 34d0c69..1d338c6 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -663,7 +663,8 @@ static int ethoc_open(struct net_device *dev) return ret;

/* calculate the number of TX/RX buffers, maximum 128 supported */ - num_bd = min(128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); + num_bd = min_t(unsigned int, + 128, (dev->mem_end - dev->mem_start + 1) / ETHOC_BUFSIZ); priv->num_tx = max(min_tx, num_bd / 4); priv->num_rx = num_bd - priv->num_tx; ethoc_write(priv, TX_BD_NUM, priv->num_tx);