diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-04-04 23:23:19 +0200 |
| commit | 0a637bcc3c66c647f52970ddd1dbae2d749dc969 (patch) | |
| tree | 55ccc56a785cac9a3b990130f70316869ee77b47 /arch/arm/boards/sama5d3xek | |
| parent | dd9f6d08a2736bf8ddc0004779c563a4c3a77cef (diff) | |
| parent | c6ef15b3879607a9e31964fc8942f95c253122f9 (diff) | |
| download | barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.gz barebox-0a637bcc3c66c647f52970ddd1dbae2d749dc969.tar.xz | |
Merge branch 'for-next/zynq'
Conflicts:
arch/arm/Makefile
Diffstat (limited to 'arch/arm/boards/sama5d3xek')
| -rw-r--r-- | arch/arm/boards/sama5d3xek/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boards/sama5d3xek/init.c b/arch/arm/boards/sama5d3xek/init.c index d17e4c2d29..743b907d77 100644 --- a/arch/arm/boards/sama5d3xek/init.c +++ b/arch/arm/boards/sama5d3xek/init.c @@ -110,12 +110,12 @@ static void ek_add_device_nand(void) {} #endif #if defined(CONFIG_DRIVER_NET_MACB) -static struct at91_ether_platform_data gmac_pdata = { +static struct macb_platform_data gmac_pdata = { .phy_interface = PHY_INTERFACE_MODE_RGMII, .phy_addr = 7, }; -static struct at91_ether_platform_data macb_pdata = { +static struct macb_platform_data macb_pdata = { .phy_interface = PHY_INTERFACE_MODE_RMII, .phy_addr = 0, }; |