diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-04-18 20:26:10 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-04-18 20:26:10 +0400 |
| commit | 5a59f9681dcf273d0dbc7826d39d77ed513821f3 (patch) | |
| tree | 6c7f0f3d1ca8a1ca0dba7ebf3662e8b8bb68b63d /arch/arm/mach-omap2/board-generic.c | |
| parent | a241dda2f11243b3b87aedf87a3dc9e72580a2b3 (diff) | |
| parent | 3896c8e6399e6bc73ddbd63de0734b48f9b749f2 (diff) | |
Automatically merging tracking-panda-fix-usb into merge-linux-linaro
Conflicting files:
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index e54a4806019..65ea5e7185f 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -49,6 +49,8 @@ static void __init omap_generic_init(void) omap4_panda_display_init_of(); else if (of_machine_is_compatible("ti,omap4-sdp")) omap_4430sdp_display_init_of(); + + usbhost_init_of(); } #ifdef CONFIG_SOC_OMAP2420 |