diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 10:44:55 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 10:44:55 -0500 |
| commit | ed20178d6266e0b9c9370e6862ac1eadadb8b321 (patch) | |
| tree | 91cd87e854b53e43c6ec288d1e4dfc261fbbb677 /arch/arm/mach-at91/board-cap9adk.c | |
| parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
| parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-cap9adk.c')
| -rw-r--r-- | arch/arm/mach-at91/board-cap9adk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c index da2616f20e10..14d1d0556638 100644 --- a/arch/arm/mach-at91/board-cap9adk.c +++ b/arch/arm/mach-at91/board-cap9adk.c | |||
| @@ -153,7 +153,7 @@ static struct at91_mmc_data __initdata cap9adk_mmc_data = { | |||
| 153 | /* | 153 | /* |
| 154 | * MACB Ethernet device | 154 | * MACB Ethernet device |
| 155 | */ | 155 | */ |
| 156 | static struct at91_eth_data __initdata cap9adk_macb_data = { | 156 | static struct macb_platform_data __initdata cap9adk_macb_data = { |
| 157 | .is_rmii = 1, | 157 | .is_rmii = 1, |
| 158 | }; | 158 | }; |
| 159 | 159 | ||