From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Tue, 22 Jul 2014 19:25:33 +0000 (-0300)
Subject: [media] si2168: Fix a badly solved merge conflict
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~155^2~148
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcb388ce6c293b36a71a24c0bfe526c13774302a;p=pandora-kernel.git

[media] si2168: Fix a badly solved merge conflict

changeset a733291d6934 didn't merge the fixes well. It ended by
restoring some bad logic removed there.

Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
---

Reading git-diff-tree failed