Yes, ignore my patch. It was applied to usb-next already and I forgot to check there. Jerry On Tue Jul 10 12, Greg KH wrote: > On Mon, Jul 09, 2012 at 11:32:20PM -0700, Gerard Snitselaar wrote: > > commit ff9cce82 added back 2 lines that were removed by commit > > c83a8542 causing build of twl6030-usb to get an error due to otg being > > referenced, but not declared. This patch removes those 2 lines again > > to restore intent of commit c83a8542. > > > > Signed-off-by: Gerard Snitselaar <dev@xxxxxxxxxxxxxx> > > --- > > drivers/usb/otg/twl6030-usb.c | 2 -- > > 1 file changed, 2 deletions(-) > > > > diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c > > index a3d0c04..6907d8d 100644 > > --- a/drivers/usb/otg/twl6030-usb.c > > +++ b/drivers/usb/otg/twl6030-usb.c > > @@ -302,8 +302,6 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl) > > twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR); > > twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET); > > status = OMAP_MUSB_ID_GROUND; > > - otg->default_a = true; > > - twl->phy.state = OTG_STATE_A_IDLE; > > Didn't I apply this same patch yesterday? Can you verify that this is > still needed in the usb-next branch of my git tree? > > confused, > > greg k-h -- 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