summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/board-rsi-ews.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-29 15:44:55 (GMT)
committerArnd Bergmann <arnd@arndb.de>2011-11-29 15:44:55 (GMT)
commited20178d6266e0b9c9370e6862ac1eadadb8b321 (patch)
tree91cd87e854b53e43c6ec288d1e4dfc261fbbb677 /arch/arm/mach-at91/board-rsi-ews.c
parentd28bdfc5c80fb64bf50824920bf9b554732dec74 (diff)
parentc220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff)
downloadlinux-fsl-qoriq-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.xz
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-rsi-ews.c')
-rw-r--r--arch/arm/mach-at91/board-rsi-ews.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-rsi-ews.c b/arch/arm/mach-at91/board-rsi-ews.c
index e927df0..ed3b21f 100644
--- a/arch/arm/mach-at91/board-rsi-ews.c
+++ b/arch/arm/mach-at91/board-rsi-ews.c
@@ -60,7 +60,7 @@ static void __init rsi_ews_init_early(void)
/*
* Ethernet
*/
-static struct at91_eth_data rsi_ews_eth_data __initdata = {
+static struct macb_platform_data rsi_ews_eth_data __initdata = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
};