Compiling macb.c fails because the type of parameter 2 of macb_poll() was changed from int* to int. Furthermore, a local variable was removed but was still used inside the function. This patch fixes it.
Signed-off-by: Hans J. Koch <[EMAIL PROTECTED]> --- Index: linux-2.6.23-rc/drivers/net/macb.c =================================================================== --- linux-2.6.23-rc.orig/drivers/net/macb.c 2007-09-27 12:55:21.000000000 +0200 +++ linux-2.6.23-rc/drivers/net/macb.c 2007-09-27 13:00:28.000000000 +0200 @@ -492,7 +492,7 @@ } dev_dbg(&bp->pdev->dev, "poll: status = %08lx, budget = %d\n", - (unsigned long)status, *budget); + (unsigned long)status, budget); if (!(status & MACB_BIT(REC))) { dev_warn(&bp->pdev->dev, @@ -503,7 +503,7 @@ } work_done = macb_rx(bp, budget); - if (work_done < orig_budget) + if (work_done < budget) netif_rx_complete(dev, napi); /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/