From: Bill Gatliff Date: Fri, 18 Dec 2009 15:57:22 +0000 (-0600) Subject: USB: Fix double-linking of drivers/usb/otg when ULPI is selected X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=179192d38e8906f00479ec944c15b685400232b0;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman --- 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/