summaryrefslogtreecommitdiffstats
path: root/kernel/Kconfig.hz
diff options
context:
space:
mode:
authorHema HK <hemahk@ti.com>2011-03-17 16:11:58 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-23 13:14:17 -0700
commit5f1e8ce75c19b0433aba6e0ea28937f1ee5d849e (patch)
tree751c1e9307fab582eb842324e0199b4d1e5e0beb /kernel/Kconfig.hz
parentb5a3b3d985493c173925907adfebf3edab236fe7 (diff)
usb: musb: Fix for merge issue
There was conflict while merging 2 patches. Enabling vbus code is wrongly moved to error check if loop. This is a fix to resolve the merge issue. Signed-off-by: Hema HK <hemahk@ti.com> Cc: Felipe Balbi <balbi@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel/Kconfig.hz')
0 files changed, 0 insertions, 0 deletions