On Tue, Nov 25, 2014 at 12:28:46PM +0100, Andreas Herrmann wrote: > From: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > > Remove special-purpose octeon drivers and instead use ehci-platform > and ohci-platform as suggested with > http://marc.info/?l=linux-mips&m=140139694721623&w=2 > > [andreas.herrmann: > fixed compile error] > > Cc: David Daney <david.daney@xxxxxxxxxx> > Cc: Alex Smith <alex.smith@xxxxxxxxxx> > Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx> > Signed-off-by: Andreas Herrmann <andreas.herrmann@xxxxxxxxxxxxxxxxxx> > Acked-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> > Tested-by: Aaro Koskinen <aaro.koskinen@xxxxxx> > --- > arch/mips/cavium-octeon/octeon-platform.c | 274 ++++++++++++++++++++++++++++- > arch/mips/configs/cavium_octeon_defconfig | 3 + > drivers/usb/host/Kconfig | 18 +- > drivers/usb/host/Makefile | 1 - > drivers/usb/host/ehci-hcd.c | 5 - > drivers/usb/host/ehci-octeon.c | 182 ------------------- > drivers/usb/host/octeon2-common.c | 200 --------------------- > drivers/usb/host/ohci-hcd.c | 5 - > drivers/usb/host/ohci-octeon.c | 196 --------------------- > 9 files changed, 285 insertions(+), 599 deletions(-) > delete mode 100644 drivers/usb/host/ehci-octeon.c > delete mode 100644 drivers/usb/host/octeon2-common.c > delete mode 100644 drivers/usb/host/ohci-octeon.c > > > There was a conflict with commits > 073153bf22764 (host: ehci-octeon: remove duplicate check on resource) > c6d413cebd82c (host: ohci-octeon: remove duplicate check on resource) > > I rebased the patch to your usb-next branch as of > v3.18-rc4-66-g69b7290. > > Patch 2 and 3 of the series should apply w/o issues. They are long-gone from my queue, please resend. thanks, greg k-h
