From 179192d38e8906f00479ec944c15b685400232b0 Mon Sep 17 00:00:00 2001
From: Bill Gatliff <bgat@billgatliff.com>
Date: Fri, 18 Dec 2009 09:57:22 -0600
Subject: [PATCH] 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>
---
 drivers/usb/Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile
index 473aa1a20de9b..be3c9b80bc9fb 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/
-- 
2.30.2