diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-12-07 16:43:21 +0100 |
| commit | 8f32824c6e374092f3c1dec431e5e83f839353fe (patch) | |
| tree | 9ceed735e77d1329ebf70c9f9abb78263358d2dd /arch/arm/boards/at91sam9m10g45ek | |
| parent | 759946809a350b0a8158842924ab139e93eeef13 (diff) | |
| parent | bba73109ce1f54c7ffca044b00aacb320be888c2 (diff) | |
| download | barebox-8f32824c6e374092f3c1dec431e5e83f839353fe.tar.gz barebox-8f32824c6e374092f3c1dec431e5e83f839353fe.tar.xz | |
Merge branch 'for-next/phylib'
Conflicts:
drivers/net/phy/phy.c
Diffstat (limited to 'arch/arm/boards/at91sam9m10g45ek')
| -rw-r--r-- | arch/arm/boards/at91sam9m10g45ek/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/at91sam9m10g45ek/init.c b/arch/arm/boards/at91sam9m10g45ek/init.c index 6ad3726acc..4b6d5c4014 100644 --- a/arch/arm/boards/at91sam9m10g45ek/init.c +++ b/arch/arm/boards/at91sam9m10g45ek/init.c @@ -107,7 +107,7 @@ static void ek_add_device_nand(void) } static struct at91_ether_platform_data macb_pdata = { - .flags = AT91SAM_ETHER_RMII, + .is_rmii = 1, .phy_addr = 0, }; |