tree 3cf7c6eca9acf00220ac4a0e9f3562069559b55c
parent fe2072cc1768b0f979195acf19b8ccd381e541c3
author Kishon Vijay Abraham I <kishon@ti.com> 1341815680 +0530
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1341852411 -0700

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>