summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorBill Gatliff <bgat@billgatliff.com>2009-12-18 09:57:22 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-23 11:34:10 -0800
commit179192d38e8906f00479ec944c15b685400232b0 (patch)
tree15c85fb7ab009e165538d5f07d1d5b58b7b1b32a /drivers/usb
parentff3b968ceeb73c037cf4759d21923943970f9a7a (diff)
downloadlinux-179192d38e8906f00479ec944c15b685400232b0.tar.bz2
USB: Fix double-linking of drivers/usb/otg when ULPI is selected
This patch corrects a problem where drivers/usb/otg is linked twice if CONFIG_USB_ULPI is selected, resulting in a build error (symbol conflict). The files in that directory are properly linked already as part of CONFIG_USB, and need not be indicated specifically for CONFIG_USB_ULPI. Signed-off-by: Bill Gatliff <bgat@billgatliff.com> Acked-by: Felipe Balbi <felipe.balbi@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 473aa1a20de9..be3c9b80bc9f 100644
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -44,5 +44,3 @@ obj-y += early/
obj-$(CONFIG_USB_ATM) += atm/
obj-$(CONFIG_USB_SPEEDTOUCH) += atm/
-
-obj-$(CONFIG_USB_ULPI) += otg/