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-yl-9200.c | |
| parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
| parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-yl-9200.c')
| -rw-r--r-- | arch/arm/mach-at91/board-yl-9200.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-yl-9200.c b/arch/arm/mach-at91/board-yl-9200.c index 12a3f955162b..2c40a21b2794 100644 --- a/arch/arm/mach-at91/board-yl-9200.c +++ b/arch/arm/mach-at91/board-yl-9200.c | |||
| @@ -110,7 +110,7 @@ static struct gpio_led yl9200_leds[] = { | |||
| 110 | /* | 110 | /* |
| 111 | * Ethernet | 111 | * Ethernet |
| 112 | */ | 112 | */ |
| 113 | static struct at91_eth_data __initdata yl9200_eth_data = { | 113 | static struct macb_platform_data __initdata yl9200_eth_data = { |
| 114 | .phy_irq_pin = AT91_PIN_PB28, | 114 | .phy_irq_pin = AT91_PIN_PB28, |
| 115 | .is_rmii = 1, | 115 | .is_rmii = 1, |
| 116 | }; | 116 | }; |