diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 15:44:55 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 15:44:55 (GMT) |
commit | ed20178d6266e0b9c9370e6862ac1eadadb8b321 (patch) | |
tree | 91cd87e854b53e43c6ec288d1e4dfc261fbbb677 /arch/arm/mach-at91/board-sam9m10g45ek.c | |
parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
download | linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.xz |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-sam9m10g45ek.c')
-rw-r--r-- | arch/arm/mach-at91/board-sam9m10g45ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c index 3e0d5a9..061465d 100644 --- a/arch/arm/mach-at91/board-sam9m10g45ek.c +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c @@ -115,7 +115,7 @@ static struct mci_platform_data __initdata mci1_data = { /* * MACB Ethernet device */ -static struct at91_eth_data __initdata ek_macb_data = { +static struct macb_platform_data __initdata ek_macb_data = { .phy_irq_pin = AT91_PIN_PD5, .is_rmii = 1, }; |