summaryrefslogtreecommitdiff
path: root/drivers/usb/host/ohci-omap.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-11 09:13:58 (GMT)
committerIngo Molnar <mingo@elte.hu>2008-09-11 09:13:58 (GMT)
commit6ef62164e794c480259ac158aa6c8c7b85746545 (patch)
treec4540211d0cef9c88d96f30f89ac4b9c1a570683 /drivers/usb/host/ohci-omap.c
parente75b986af7881ed8d8ccb1ed154045ed17cfebd0 (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
downloadlinux-6ef62164e794c480259ac158aa6c8c7b85746545.tar.xz
Merge commit 'v2.6.27-rc6' into timers/urgent
Diffstat (limited to 'drivers/usb/host/ohci-omap.c')
-rw-r--r--drivers/usb/host/ohci-omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 1eb64d0..95b3ec8 100644
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -208,7 +208,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
if (cpu_is_omap16xx())
ocpi_enable();
-#ifdef CONFIG_ARCH_OMAP_OTG
+#ifdef CONFIG_USB_OTG
if (need_transceiver) {
ohci->transceiver = otg_get_transceiver();
if (ohci->transceiver) {