summaryrefslogtreecommitdiff
path: root/arch/avr32/boards/atngw100/setup.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/avr32/boards/atngw100/setup.c
parentd28bdfc5c80fb64bf50824920bf9b554732dec74 (diff)
parentc220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff)
downloadlinux-fsl-qoriq-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.xz
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/avr32/boards/atngw100/setup.c')
-rw-r--r--arch/avr32/boards/atngw100/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 1f17bde..7c756fb 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -109,7 +109,7 @@ struct eth_addr {
u8 addr[6];
};
static struct eth_addr __initdata hw_addr[2];
-static struct eth_platform_data __initdata eth_data[2];
+static struct macb_platform_data __initdata eth_data[2];
static struct spi_board_info spi0_board_info[] __initdata = {
{