diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 16:06:31 +0000 |
| commit | b48741cce3be32a48af9a2b272f3f13a077375cf (patch) | |
| tree | e4bc91713e02fa6d8f08b07de53ea8f905593dfa /arch/avr32/boards/merisc/setup.c | |
| parent | 54b6c82ac9a124804816f244f587c0f40d25ad01 (diff) | |
| parent | a07613a54d700a974f3a4a657da78ef5d097315d (diff) | |
Merge branch 'samsung/cleanup' into next/cleanup2
Diffstat (limited to 'arch/avr32/boards/merisc/setup.c')
| -rw-r--r-- | arch/avr32/boards/merisc/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/merisc/setup.c b/arch/avr32/boards/merisc/setup.c index e61bc948f95..ed137e33579 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) { |