diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-09-27 18:51:13 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:49:06 -0800 |
| commit | d6848ad6ddbd3ab7ee5fda5dcde7e99d97b5b288 (patch) | |
| tree | f3cd7f560437f589877a4c37b408a492aba73bca /drivers/video/tegra/host/nvhost_acm.c | |
| parent | 1fb5af21e524f5b3663aee6a7074de419bd674f9 (diff) | |
ARM: tegra: video: Use feature conditionals
Change-Id: I28ffcd59e717c0aa3f5dc5b19ba9b4a2e4081e9b
Reviewed-on: http://git-master/r/54853
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Rebase-Id: R3cf9b7a8de5f22b86b603842b2e6746da797a6d7
Diffstat (limited to 'drivers/video/tegra/host/nvhost_acm.c')
| -rw-r--r-- | drivers/video/tegra/host/nvhost_acm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tegra/host/nvhost_acm.c b/drivers/video/tegra/host/nvhost_acm.c index d665a35ae905..5fb062df8fcf 100644 --- a/drivers/video/tegra/host/nvhost_acm.c +++ b/drivers/video/tegra/host/nvhost_acm.c @@ -628,7 +628,7 @@ int nvhost_module_init(struct nvhost_module *mod, const char *name, mod->powergate_id = TEGRA_POWERGATE_3D; if (!mod->can_powergate) tegra_unpowergate_partition(mod->powergate_id); -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#ifdef CONFIG_ARCH_TEGRA_HAS_DUAL_3D mod->powergate_id2 = TEGRA_POWERGATE_3D1; if (!mod->can_powergate) tegra_unpowergate_partition(mod->powergate_id2); @@ -649,7 +649,7 @@ int nvhost_module_init(struct nvhost_module *mod, const char *name, tegra_unpowergate_partition(mod->powergate_id); mod->powergate_id = -1; -#ifdef CONFIG_ARCH_TEGRA_3x_SOC +#ifdef CONFIG_ARCH_TEGRA_HAS_DUAL_3D if (mod->powergate_id2 == TEGRA_POWERGATE_3D1) { tegra_unpowergate_partition(mod->powergate_id2); mod->powergate_id2 = -1; |