diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:16:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:16:36 +0200 |
| commit | a1b215e2a2a013327693f2fb990957b746f26cf5 (patch) | |
| tree | c998a43b8022f623ac86a0de246d05ed36a86e9e /drivers/net/macb.c | |
| parent | f9eabcb357ea294e3e01bfe26841bf51d6bd8f05 (diff) | |
| parent | b5873f1732b92a25690e1513b90dfb0d644f6697 (diff) | |
| download | u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.zip u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.gz u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/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 9c98338..703784e 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -417,13 +417,13 @@ static int macb_init(struct eth_device *netdev, bd_t *bd) /* choose RMII or MII mode. This depends on the board */ #ifdef CONFIG_RMII -#ifdef CONFIG_AT91CAP9ADK +#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) macb_writel(macb, USRIO, MACB_BIT(RMII) | MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, 0); #endif #else -#ifdef CONFIG_AT91CAP9ADK +#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) macb_writel(macb, USRIO, MACB_BIT(CLKEN)); #else macb_writel(macb, USRIO, MACB_BIT(MII)); |