From: Kishon Vijay Abraham I <kishon@ti.com>
Date: Mon, 9 Jul 2012 06:34:40 +0000 (+0530)
Subject: drivers: usb: otg: fix build break in twl6030-usb.c
X-Git-Tag: v3.6-rc1~101^2~53^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=277bd8746bb8d23c00ff8343e58df783544e961e;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed