diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2012-01-12 13:11:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 13:11:43 +0900 |
| commit | b1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch) | |
| tree | 17d15f3a6dc5bdd6205070dbef0e339421b13d25 /arch/arm/mach-at91/board-1arm.c | |
| parent | Merge branch 'sh/hwblk' into sh-latest (diff) | |
| parent | sh: sh2a: Improve cache flush/invalidate functions (diff) | |
| download | linux-dev-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.xz linux-dev-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.zip | |
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'arch/arm/mach-at91/board-1arm.c')
| -rw-r--r-- | arch/arm/mach-at91/board-1arm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/board-1arm.c b/arch/arm/mach-at91/board-1arm.c index 367d5cd5e362..2628384aaae1 100644 --- a/arch/arm/mach-at91/board-1arm.c +++ b/arch/arm/mach-at91/board-1arm.c @@ -63,13 +63,15 @@ static void __init onearm_init_early(void) at91_set_serial_console(0); } -static struct at91_eth_data __initdata onearm_eth_data = { +static struct macb_platform_data __initdata onearm_eth_data = { .phy_irq_pin = AT91_PIN_PC4, .is_rmii = 1, }; static struct at91_usbh_data __initdata onearm_usbh_data = { .ports = 1, + .vbus_pin = {-EINVAL, -EINVAL}, + .overcurrent_pin= {-EINVAL, -EINVAL}, }; static struct at91_udc_data __initdata onearm_udc_data = { |