summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/Makefile
diff options
context:
space:
mode:
authorAlan Stern <stern@rowland.harvard.edu>2013-01-23 13:26:15 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-23 11:27:08 -0800
commitdba63b2f733ebfd89bbb15e8fe8ca10fd3871a7f (patch)
tree8249d3bbd894fc85d9f4386a4b5f30731674db56 /drivers/usb/host/Makefile
parent9debc1793b36124b9304255d2e8b5b6d8b491793 (diff)
downloadop-kernel-dev-dba63b2f733ebfd89bbb15e8fe8ca10fd3871a7f.zip
op-kernel-dev-dba63b2f733ebfd89bbb15e8fe8ca10fd3871a7f.tar.gz
USB: EHCI: fix build error in ehci-mxc
This patch (as1643b) fixes a build error in ehci-hcd when compiling for ARM with allmodconfig: drivers/usb/host/ehci-hcd.c:1285:0: warning: "PLATFORM_DRIVER" redefined [enabled by default] drivers/usb/host/ehci-hcd.c:1255:0: note: this is the location of the previous definition drivers/usb/host/ehci-mxc.c:280:31: warning: 'ehci_mxc_driver' defined but not used [-Wunused-variable] drivers/usb/host/ehci-hcd.c:1285:0: warning: "PLATFORM_DRIVER" redefined [enabled by default] drivers/usb/host/ehci-hcd.c:1255:0: note: this is the location of the previous definition The fix is to convert ehci-mxc over to the new "ehci-hcd is a library" scheme so that it can coexist peacefully with the ehci-platform driver. As part of the conversion the ehci_mxc_priv data structure, which was allocated dynamically, is now placed where it belongs: in the private area at the end of struct ehci_hcd. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/host/Makefile')
-rw-r--r--drivers/usb/host/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 1eb4c30..001fbff 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_PCI) += pci-quirks.o
obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o
obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o
obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o
+obj-$(CONFIG_USB_EHCI_MXC) += ehci-mxc.o
obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o
obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o
OpenPOWER on IntegriCloud