commit ebd2931e4212e431aa033d3826318040b06f188c
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 31 05:54:03 2011 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Mon Oct 31 05:54:03 2011 -0700
tree 52e14fd7465c37798bc0f0ceac1fdb865e9b2953
parent 03122326da45599e720d1bd88e4e10c9c187a4a9
parent 15f25535688609ec29b7f6e5921721953ef33345

Merge "USB: Add nop functions for !USB case" into msm-3.0

include/linux/usb/hcd.h

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 0097136..b43a097 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -379,9 +379,18 @@
 extern struct usb_hcd *usb_get_hcd(struct usb_hcd *hcd);
 extern void usb_put_hcd(struct usb_hcd *hcd);
 extern int usb_hcd_is_primary_hcd(struct usb_hcd *hcd);
+#ifdef CONFIG_USB
 extern int usb_add_hcd(struct usb_hcd *hcd,
 		unsigned int irqnum, unsigned long irqflags);
 extern void usb_remove_hcd(struct usb_hcd *hcd);
+#else
+static inline int
+usb_add_hcd(struct usb_hcd *hcd, unsigned int irqnum, unsigned long irqflags)
+{
+	return 0;
+}
+static inline void usb_remove_hcd(struct usb_hcd *hcd) {}
+#endif
 
 struct platform_device;
 extern void usb_hcd_platform_shutdown(struct platform_device *dev);