diff options
| author | Bill Gatliff <bgat@billgatliff.com> | 2009-12-18 16:57:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-23 20:34:10 +0100 |
| commit | 179192d38e8906f00479ec944c15b685400232b0 (patch) | |
| tree | 15c85fb7ab009e165538d5f07d1d5b58b7b1b32a /drivers/usb/Makefile | |
| parent | USB: gadget: Use ERR_PTR/IS_ERR (diff) | |
| download | linux-179192d38e8906f00479ec944c15b685400232b0.tar.xz linux-179192d38e8906f00479ec944c15b685400232b0.zip | |
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/Makefile')
| -rw-r--r-- | drivers/usb/Makefile | 2 |
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/ |