]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: host: fix build errors
authorShridhar Rasal <srasal@nvidia.com>
Tue, 10 Jun 2014 10:50:42 +0000 (16:20 +0530)
committerTerje Bergstrom <tbergstrom@nvidia.com>
Wed, 11 Jun 2014 06:12:48 +0000 (23:12 -0700)
Fix build errors when CONFIG_VI_ONE_DEVICE enabled

Bug 1436477

Change-Id: I38a5ad7ee63eb3817ff43a78b7ebf72ce1be78ba
Signed-off-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-on: http://git-master/r/421623
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
drivers/video/tegra/host/t124/t124.c
drivers/video/tegra/host/t210/t210.c

index 93f2206d2331773ce40ed18e9e43c15ceff90b08..f1dbdcd63e332843185c31d26328a00aa8ea9153 100644 (file)
@@ -267,7 +267,6 @@ static struct platform_device tegra_vi01_device = {
                .platform_data = &t124_vi_info,
        },
 };
-#endif
 
 struct nvhost_device_data t124_vib_info = {
        .num_channels   = 1,
@@ -304,6 +303,7 @@ static struct platform_device tegra_vi01b_device = {
                .platform_data = &t124_vib_info,
        },
 };
+#endif
 
 static struct resource msenc_resources[] = {
        {
index 2bed7bf45ea0a5628bc0a21272dab3c0304572af..5091da04cd2290271b03ed881787f592812ab276 100644 (file)
@@ -82,8 +82,8 @@ struct nvhost_device_data t21_vi_info = {
        .clocks = {
                {"vi", UINT_MAX},
                {"csi", 0},
-               {"cilab", 102000000} },
-               {"cilcd", 102000000} },
+               {"cilab", 102000000},
+               {"cilcd", 102000000},
                {"cile", 102000000} },
        .ctrl_ops         = &tegra_vi_ctrl_ops,
        .num_channels  = 4,