diff --git a/[refs] b/[refs]
index 05e9f4da3176..8d79d24d0405 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 767e366fc9e667c1ef71af588d33b7ec27c5ed1d
+refs/heads/master: 4ce22537a28eeb6a29a2b4d1049c703a80c25bd1
diff --git a/trunk/drivers/net/ethoc.c b/trunk/drivers/net/ethoc.c
index 34d0c69e67f7..1d338c6f5314 100644
--- a/trunk/drivers/net/ethoc.c
+++ b/trunk/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);