summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-carmeva.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-29 16:44:55 +0100
committerArnd Bergmann <arnd@arndb.de>2011-11-29 16:44:55 +0100
commited20178d6266e0b9c9370e6862ac1eadadb8b321 (patch)
tree91cd87e854b53e43c6ec288d1e4dfc261fbbb677 /arch/arm/mach-at91/board-carmeva.c
parentARM: at91: make rm9200 rtc drivers soc independent (diff)
parentmacb: convert printk to netdev_ and friends (diff)
downloadlinux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.xz
linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.zip
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-carmeva.c')
-rw-r--r--arch/arm/mach-at91/board-carmeva.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-carmeva.c b/arch/arm/mach-at91/board-carmeva.c
index 774c87fcbd5b..529b356cdb7d 100644
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
@@ -57,7 +57,7 @@ static void __init carmeva_init_early(void)
at91_set_serial_console(0);
}
-static struct at91_eth_data __initdata carmeva_eth_data = {
+static struct macb_platform_data __initdata carmeva_eth_data = {
.phy_irq_pin = AT91_PIN_PC4,
.is_rmii = 1,
};