diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:21:04 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 20:23:00 +0000 |
commit | 928a11ba36f999436915ea2b1eadf54301f93059 (patch) | |
tree | 8d7cb575d528ddd4b1165e4690401c729c1eb930 /arch/avr32/boards/atstk1000 | |
parent | 237c78beb8a988453bac1993d21f025d070a0d8d (diff) | |
parent | 40ba95fdf158713377d47736b1b3a9d75f4f2515 (diff) |
Merge branch 'next/cleanup' into samsung/dt
Conflicts:
arch/arm/mach-exynos/common.c
The common.c file gets changes from rmk/stable-devel (part of
next/cleanup), rmk/restart, samsung/dt and follow-on branches
from the samsung tree.
Pulling it all together here hopefully avoids having to do
even more conflicting merge changesets in this one file. What
a mess!
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/avr32/boards/atstk1000')
-rw-r--r-- | arch/avr32/boards/atstk1000/atstk1002.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/boards/atstk1000/atstk1002.c b/arch/avr32/boards/atstk1000/atstk1002.c index 4643ff5107c..c56ddac85d6 100644 --- a/arch/avr32/boards/atstk1000/atstk1002.c +++ b/arch/avr32/boards/atstk1000/atstk1002.c @@ -105,7 +105,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] = { { /* * The MDIO pullups on STK1000 are a bit too weak for |