diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 16:44:55 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-29 16:44:55 +0100 |
| commit | ed20178d6266e0b9c9370e6862ac1eadadb8b321 (patch) | |
| tree | 91cd87e854b53e43c6ec288d1e4dfc261fbbb677 /arch/arm/mach-at91/board-pcontrol-g20.c | |
| parent | ARM: at91: make rm9200 rtc drivers soc independent (diff) | |
| parent | macb: convert printk to netdev_ and friends (diff) | |
| download | linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.tar.xz linux-ed20178d6266e0b9c9370e6862ac1eadadb8b321.zip | |
Merge branch 'drivers/macb-gem-cleanup' into at91/gpio
Diffstat (limited to 'arch/arm/mach-at91/board-pcontrol-g20.c')
| -rw-r--r-- | arch/arm/mach-at91/board-pcontrol-g20.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-pcontrol-g20.c b/arch/arm/mach-at91/board-pcontrol-g20.c index 0e3c632d30eb..9a6e02163950 100644 --- a/arch/arm/mach-at91/board-pcontrol-g20.c +++ b/arch/arm/mach-at91/board-pcontrol-g20.c @@ -122,7 +122,7 @@ static struct at91_udc_data __initdata pcontrol_g20_udc_data = { /* * MACB Ethernet device */ -static struct at91_eth_data __initdata macb_data = { +static struct macb_platform_data __initdata macb_data = { .phy_irq_pin = AT91_PIN_PA28, .is_rmii = 1, }; |