diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 05:50:07 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-13 05:50:26 +0000 |
| commit | ffafe770a4160862476405a442d28ee48d2249ef (patch) | |
| tree | 5bb7d5913427c245c61dd5eb384321dff386f841 /drivers/usb/otg/mv_otg.c | |
| parent | 0dcd627896fb87b2e78a1ed78e469591208cffcd (diff) | |
| parent | da911782be4c82dc1222aa0cb5bef28605d1e117 (diff) | |
| download | op-kernel-dev-ffafe770a4160862476405a442d28ee48d2249ef.zip op-kernel-dev-ffafe770a4160862476405a442d28ee48d2249ef.tar.gz | |
Merge branch 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.3-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (2 commits)
ARM: EXYNOS: Add cpu-offset property in gic device tree node
ARM: EXYNOS: Bring exynos4-dt up to date
Linux 3.3-rc3
This includes an update to the v3.3-rc3 release from v3.3-rc2
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/usb/otg/mv_otg.c')
| -rw-r--r-- | drivers/usb/otg/mv_otg.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/otg/mv_otg.c b/drivers/usb/otg/mv_otg.c index db0d4fc..b5fbe14 100644 --- a/drivers/usb/otg/mv_otg.c +++ b/drivers/usb/otg/mv_otg.c @@ -202,6 +202,7 @@ static void mv_otg_init_irq(struct mv_otg *mvotg) static void mv_otg_start_host(struct mv_otg *mvotg, int on) { +#ifdef CONFIG_USB struct otg_transceiver *otg = &mvotg->otg; struct usb_hcd *hcd; @@ -216,6 +217,7 @@ static void mv_otg_start_host(struct mv_otg *mvotg, int on) usb_add_hcd(hcd, hcd->irq, IRQF_SHARED); else usb_remove_hcd(hcd); +#endif /* CONFIG_USB */ } static void mv_otg_start_periphrals(struct mv_otg *mvotg, int on) |
