video: tegra: host: fix merge build break
authorAdeel Raza <araza@nvidia.com>
Tue, 9 Apr 2013 00:17:09 +0000 (17:17 -0700)
committerDan Willemsen <dwillemsen@nvidia.com>
Sat, 14 Sep 2013 20:23:37 +0000 (13:23 -0700)
commit95fb0fcbc5b1c9296dec1d9d244916126ed761c7
tree032d542e8aab4b32edb3e7786e828c45c76323df
parentb9349e7a133efa4fa14610b056a2edfe06c4f4e1
video: tegra: host: fix merge build break

Change-Id: I8e4884ab4bbc8ecb58493db6b81773869aad190f
Signed-off-by: Adeel Raza <araza@nvidia.com>
Reviewed-on: http://git-master/r/217762
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Ken Adams <kadams@nvidia.com>
Reviewed-by: Alexander Van Brunt <avanbrunt@nvidia.com>
drivers/video/tegra/host/host1x/host1x_cdma.c