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-sam9g20ek.c | |
| parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
| parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-sam9g20ek.c')
| -rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 0579f069d97b..a67b269a2fce 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
| @@ -123,7 +123,7 @@ static struct spi_board_info ek_spi_devices[] = { | |||
| 123 | /* | 123 | /* |
| 124 | * MACB Ethernet device | 124 | * MACB Ethernet device |
| 125 | */ | 125 | */ |
| 126 | static struct at91_eth_data __initdata ek_macb_data = { | 126 | static struct macb_platform_data __initdata ek_macb_data = { |
| 127 | .phy_irq_pin = AT91_PIN_PA7, | 127 | .phy_irq_pin = AT91_PIN_PA7, |
| 128 | .is_rmii = 1, | 128 | .is_rmii = 1, |
| 129 | }; | 129 | }; |