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-snapper9260.c | |
| parent | d28bdfc5c80fb64bf50824920bf9b554732dec74 (diff) | |
| parent | c220f8cd01198552a616c4216f2a8e719fdb5fd9 (diff) | |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-snapper9260.c')
| -rw-r--r-- | arch/arm/mach-at91/board-snapper9260.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c index 645d8336468e..73ed8c746085 100644 --- a/arch/arm/mach-at91/board-snapper9260.c +++ b/arch/arm/mach-at91/board-snapper9260.c | |||
| @@ -65,7 +65,7 @@ static struct at91_udc_data __initdata snapper9260_udc_data = { | |||
| 65 | .vbus_polled = 1, | 65 | .vbus_polled = 1, |
| 66 | }; | 66 | }; |
| 67 | 67 | ||
| 68 | static struct at91_eth_data snapper9260_macb_data = { | 68 | static struct macb_platform_data snapper9260_macb_data = { |
| 69 | .is_rmii = 1, | 69 | .is_rmii = 1, |
| 70 | }; | 70 | }; |
| 71 | 71 | ||