On Mon, May 24, 2010 at 14:50, Greg KH wrote: > On Sat, May 22, 2010 at 10:49:08PM -0400, Mike Frysinger wrote: >> From: Ian Jeffray <ian@xxxxxxxxxxxxx> >> >> The new MUSB power code needs musb_read_txhubport() to return a value (so >> stub it as 0 like the other Blackfin hub funcs). It also needs new helper >> functions for saving/restoring context, so change the apparently unused >> musb_platform_{suspend,resume} to musb_platform_{save,restore}_context in >> the Blackfin code. >> >> Signed-off-by: Ian Jeffray <ian@xxxxxxxxxxxxx> >> Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx> >> --- >> Note: this is for 2.6.34.x and 2.6.35 >> Note: i believe this is what we want, but Cliff is free to correct me ;) >> >> drivers/usb/musb/blackfin.c | 12 ++++++++++++ >> drivers/usb/musb/musb_regs.h | 3 ++- > > > Note, I'm refusing to take any musb patch unless it comes from Felipe > due to the constant bickering from a number of the musb developers, > which is starting to really annoy me and contemplate warming up my kill > file... > > So please work with him to get this agreed apon and have him forward it > to me when ready, that's the only way I'm going to accept it. this patch is already dead pending whatever Felipe merges (as Sergei pointed out). so i'm waiting for him too ;). -mike -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html