summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <JBeulich@suse.com>2012-11-02 17:09:00 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-02 10:13:33 -0700
commitbc8d51ea7e8ae0abb90fa89407b55a7e0bcb0a2a (patch)
tree67c5221beba0a04cfc4ae742b74d765e40617d06
parent09f6ffde2ecef4cc4e2a5edaa303210cabd96f57 (diff)
downloadlinux-stable-bc8d51ea7e8ae0abb90fa89407b55a7e0bcb0a2a.tar.gz
linux-stable-bc8d51ea7e8ae0abb90fa89407b55a7e0bcb0a2a.tar.bz2
linux-stable-bc8d51ea7e8ae0abb90fa89407b55a7e0bcb0a2a.zip
fix build of EHCI debug port code when USB_CHIPIDEA but !USB_EHCI_HCD
Relax condition of building the reset interface stubs in drivers/usb/early/ehci-dbgp.c from USB_EHCI_HCD to just USB, to also cover the chipidea driver re-using code from ehci-hcd. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/early/ehci-dbgp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
index 4bfa78af379c..5e29ddeb4d33 100644
--- a/drivers/usb/early/ehci-dbgp.c
+++ b/drivers/usb/early/ehci-dbgp.c
@@ -974,7 +974,7 @@ struct console early_dbgp_console = {
.index = -1,
};
-#if IS_ENABLED(CONFIG_USB_EHCI_HCD)
+#if IS_ENABLED(CONFIG_USB)
int dbgp_reset_prep(struct usb_hcd *hcd)
{
int ret = xen_dbgp_reset_prep(hcd);
@@ -1008,7 +1008,7 @@ int dbgp_external_startup(struct usb_hcd *hcd)
return xen_dbgp_external_startup(hcd) ?: _dbgp_external_startup();
}
EXPORT_SYMBOL_GPL(dbgp_external_startup);
-#endif /* USB_EHCI_HCD */
+#endif /* USB */
#ifdef CONFIG_KGDB