diff options
author | Wolfgang Denk <wd@denx.de> | 2009-03-26 22:27:45 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-03-26 22:27:45 +0100 |
commit | aaa0e0812ffdf861993129f41936eb175a2eaa5f (patch) | |
tree | 2f729e92c83925a5acb9f204e381878928c2c57f /drivers/net/macb.c | |
parent | 99a4ffe202d8bc1d3c4faff9b8258b686ef656ca (diff) | |
parent | df486b1fa3f750b153eac7daa0b3bf1f594e5098 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'drivers/net/macb.c')
-rw-r--r-- | drivers/net/macb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index af0409bd2cf..6de0a04410a 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)); |