From: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Date: Tue, 30 Sep 2014 15:06:06 +0000 (+0530)
Subject: Staging: media: omap24xx: Merge two lines and remove unused variable
X-Git-Tag: fixes-for-v3.18-merge-window~15^2~104
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50b47bbd43510d754e86f0f590488d67f39f4374;p=pandora-kernel.git

Staging: media: omap24xx: Merge two lines and remove unused variable

This patch merges two lines and removes a variable that becomes unused
after merging.

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

Reading git-diff-tree failed