diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:47:41 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-23 20:47:41 +0000 |
| commit | 58a273745fbb2fbd01d26e7a60f0acc8c1d99469 (patch) | |
| tree | bc16200f3b6ea150b298422754e32959eaa339bc /arch/arm/mach-at91/board-csb337.c | |
| parent | 951c486f62490e032da0ad17e93270b0cfb6687f (diff) | |
| parent | 0116da4fcc1ae8a80d9002441e98768f2a6fa2fe (diff) | |
| download | talos-op-linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.tar.gz talos-op-linux-58a273745fbb2fbd01d26e7a60f0acc8c1d99469.zip | |
Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/drivers
Diffstat (limited to 'arch/arm/mach-at91/board-csb337.c')
| -rw-r--r-- | arch/arm/mach-at91/board-csb337.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-csb337.c b/arch/arm/mach-at91/board-csb337.c index c3936665e645..b004b20b8e42 100644 --- a/arch/arm/mach-at91/board-csb337.c +++ b/arch/arm/mach-at91/board-csb337.c @@ -58,7 +58,7 @@ static void __init csb337_init_early(void) at91_set_serial_console(0); } -static struct at91_eth_data __initdata csb337_eth_data = { +static struct macb_platform_data __initdata csb337_eth_data = { .phy_irq_pin = AT91_PIN_PC2, .is_rmii = 0, }; |
