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-usb-a926x.c | |
| parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
| parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-usb-a926x.c')
| -rw-r--r-- | arch/arm/mach-at91/board-usb-a926x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c index dbc2609fa7fe..2ffb2c84c7ce 100644 --- a/arch/arm/mach-at91/board-usb-a926x.c +++ b/arch/arm/mach-at91/board-usb-a926x.c | |||
| @@ -146,7 +146,7 @@ static void __init ek_add_device_spi(void) | |||
| 146 | /* | 146 | /* |
| 147 | * MACB Ethernet device | 147 | * MACB Ethernet device |
| 148 | */ | 148 | */ |
| 149 | static struct at91_eth_data __initdata ek_macb_data = { | 149 | static struct macb_platform_data __initdata ek_macb_data = { |
| 150 | .phy_irq_pin = AT91_PIN_PE31, | 150 | .phy_irq_pin = AT91_PIN_PE31, |
| 151 | .is_rmii = 1, | 151 | .is_rmii = 1, |
| 152 | }; | 152 | }; |