![Alan Stern](/assets/img/avatar_default.png)
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>
49 lines
1.5 KiB
Makefile
49 lines
1.5 KiB
Makefile
#
|
|
# Makefile for USB Host Controller Drivers
|
|
#
|
|
|
|
ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
|
|
|
|
isp1760-y := isp1760-hcd.o isp1760-if.o
|
|
|
|
fhci-y := fhci-hcd.o fhci-hub.o fhci-q.o
|
|
fhci-y += fhci-mem.o fhci-tds.o fhci-sched.o
|
|
|
|
fhci-$(CONFIG_FHCI_DEBUG) += fhci-dbg.o
|
|
|
|
xhci-hcd-y := xhci.o xhci-mem.o
|
|
xhci-hcd-y += xhci-ring.o xhci-hub.o xhci-dbg.o
|
|
xhci-hcd-$(CONFIG_PCI) += xhci-pci.o
|
|
|
|
ifneq ($(CONFIG_USB_XHCI_PLATFORM), )
|
|
xhci-hcd-y += xhci-plat.o
|
|
endif
|
|
|
|
obj-$(CONFIG_USB_WHCI_HCD) += whci/
|
|
|
|
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
|
|
obj-$(CONFIG_USB_ISP1362_HCD) += isp1362-hcd.o
|
|
obj-$(CONFIG_USB_OHCI_HCD) += ohci-hcd.o
|
|
obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o
|
|
obj-$(CONFIG_USB_FHCI_HCD) += fhci.o
|
|
obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o
|
|
obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o
|
|
obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
|
|
obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
|
|
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
|
|
obj-$(CONFIG_USB_ISP1760_HCD) += isp1760.o
|
|
obj-$(CONFIG_USB_HWA_HCD) += hwa-hc.o
|
|
obj-$(CONFIG_USB_IMX21_HCD) += imx21-hcd.o
|
|
obj-$(CONFIG_USB_FSL_MPH_DR_OF) += fsl-mph-dr-of.o
|
|
obj-$(CONFIG_USB_OCTEON2_COMMON) += octeon2-common.o
|
|
obj-$(CONFIG_USB_HCD_BCMA) += bcma-hcd.o
|
|
obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o
|