summaryrefslogtreecommitdiffstats
path: root/arch/avr32/boards/merisc
diff options
context:
space:
mode:
authorJamie Iles <jamie@jamieiles.com>2011-03-08 20:17:06 +0000
committerJamie Iles <jamie@jamieiles.com>2011-11-22 15:21:16 +0000
commit84e0cdb0a262483a3618091c43dae33d36226430 (patch)
tree63d3213354567d1e407db2a4adbc26842deadb68 /arch/avr32/boards/merisc
parent461845db2176d2e11b45f1f24cbd0ed8ddf26fcb (diff)
downloadlinux-84e0cdb0a262483a3618091c43dae33d36226430.tar.gz
macb: unify at91 and avr32 platform data
Both at91 and avr32 defines its own platform data structure for the macb driver and both share common structures though at91 includes a currently unused phy_irq_pin. Create a common macb_platform_data for macb that both at91 and avr32 can use. In future we can use this to support other architectures that use the same IP block with the macb driver. v2: rename eth_platform_data to macb_platform_data and allow at91_ether to share the platform data with macb. Signed-off-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Tested-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/avr32/boards/merisc')
-rw-r--r--arch/avr32/boards/merisc/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c
index e61bc94..ed137e3 100644
--- a/arch/avr32/boards/merisc/setup.c
+++ b/arch/avr32/boards/merisc/setup.c
@@ -52,7 +52,7 @@ struct eth_addr {
};
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 int ads7846_get_pendown_state_PB26(void)
{