9 Mar
2009
9 Mar
'09
6:07 p.m.
Hi Nicolas,
Nicolas Ferre wrote: <snip>
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index af0409b..6de0a04 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -447,14 +447,14 @@ static int macb_init(struct eth_device *netdev, bd_t *bd) /* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
- defined(CONFIG_AT91SAM9263)
- defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN));
#else macb_writel(macb, USRIO, 0); #endif #else #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
- defined(CONFIG_AT91SAM9263)
- defined(CONFIG_AT91SAM9263) || defined(CONFIG_AT91SAM9G20) macb_writel(macb, USRIO, MACB_BIT(CLKEN));
#else macb_writel(macb, USRIO, MACB_BIT(MII));
Please find a more generic way of doing this. There should be no board/cpu specific #ifdefs in common drivers. While you're at it, fix up the existing ones.
regards, Ben