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-kafa.c | |
| parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
| parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-kafa.c')
| -rw-r--r-- | arch/arm/mach-at91/board-kafa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-kafa.c b/arch/arm/mach-at91/board-kafa.c index 3bae73e63633..9628a3defcf4 100644 --- a/arch/arm/mach-at91/board-kafa.c +++ b/arch/arm/mach-at91/board-kafa.c | |||
| @@ -61,7 +61,7 @@ static void __init kafa_init_early(void) | |||
| 61 | at91_set_serial_console(0); | 61 | at91_set_serial_console(0); |
| 62 | } | 62 | } |
| 63 | 63 | ||
| 64 | static struct at91_eth_data __initdata kafa_eth_data = { | 64 | static struct macb_platform_data __initdata kafa_eth_data = { |
| 65 | .phy_irq_pin = AT91_PIN_PC4, | 65 | .phy_irq_pin = AT91_PIN_PC4, |
| 66 | .is_rmii = 0, | 66 | .is_rmii = 0, |
| 67 | }; | 67 | }; |