On Tue, Jan 22, 2013 at 12:00:35PM -0500, Alan Stern wrote: > This patch (as1643) 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 <[email protected]> > Tested-by: Shawn Guo <[email protected]> > > --- > > drivers/usb/host/Kconfig | 2 > drivers/usb/host/Makefile | 1 > drivers/usb/host/ehci-hcd.c | 6 -- > drivers/usb/host/ehci-mxc.c | 127 > +++++++++++++++++++------------------------- > 4 files changed, 58 insertions(+), 78 deletions(-)
This patch fails to apply: patching file drivers/usb/host/Kconfig patching file drivers/usb/host/Makefile patching file drivers/usb/host/ehci-hcd.c patching file drivers/usb/host/ehci-mxc.c Hunk #1 FAILED at 17. Hunk #2 succeeded at 112 (offset -1 lines). Hunk #3 succeeded at 129 (offset -1 lines). Hunk #4 succeeded at 167 (offset -1 lines). Hunk #5 succeeded at 194 (offset -1 lines). Hunk #6 succeeded at 214 (offset -1 lines). Hunk #7 succeeded at 242 (offset -1 lines). Hunk #8 succeeded at 254 (offset -1 lines). Hunk #9 succeeded at 277 (offset -1 lines). 1 out of 9 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-mxc.c.rej Any ideas? I've applied the first three patches now, but not this one. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
