diff options
author | Kishon Vijay Abraham I <kishon@ti.com> | 2012-07-09 02:34:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-09 12:46:51 -0400 |
commit | 277bd8746bb8d23c00ff8343e58df783544e961e (patch) | |
tree | 3cf7c6eca9acf00220ac4a0e9f3562069559b55c | |
parent | fe2072cc1768b0f979195acf19b8ccd381e541c3 (diff) |
drivers: usb: otg: fix build break in twl6030-usb.c
Fixed a mistake in the merge conflict resoultion commit(ff9cce) in file
twl6030-usb.c
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/otg/twl6030-usb.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c index a3d0c0405cca..6907d8df7a27 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) | |||
302 | twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR); | 302 | twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_CLR); |
303 | twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET); | 303 | twl6030_writeb(twl, TWL_MODULE_USB, 0x10, USB_ID_INT_EN_HI_SET); |
304 | status = OMAP_MUSB_ID_GROUND; | 304 | status = OMAP_MUSB_ID_GROUND; |
305 | otg->default_a = true; | ||
306 | twl->phy.state = OTG_STATE_A_IDLE; | ||
307 | twl->linkstat = status; | 305 | twl->linkstat = status; |
308 | omap_musb_mailbox(status); | 306 | omap_musb_mailbox(status); |
309 | } else { | 307 | } else { |