On Thu, Mar 15, 2012 at 11:40:11PM +0100, Hauke Mehrtens wrote: > On 03/15/2012 08:44 PM, Greg KH wrote: > > On Tue, Mar 13, 2012 at 01:04:50AM +0100, Hauke Mehrtens wrote: > >> This adds a USB driver using the generic platform device driver for the > >> USB controller found on the Broadcom bcma bus. The bcma bus just > >> exposes one device which serves the OHCI and the EHCI controller at the > >> same time. This driver probes for this USB controller and creates and > >> registers two new platform devices which will be probed by the new > >> generic platform device driver. This makes it possible to use the EHCI > >> and the OCHI controller on the bcma bus at the same time. > >> > >> Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx> > >> --- > >> drivers/usb/host/Kconfig | 12 ++ > > > > This patch fails to apply here, and I can't seem to figure out what tree > > you made this against to fix it up by hand on my end. > > > > Any thoughts? > > > > greg k-h > > This patch was against > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#master, but > I will rebase it onto usb/usb-next and send a new version of the patches > you have not applied. Thanks, master tracks Linus's tree, which is not good to send patches against :) greg k-h