diff options
| author | Krishna Reddy <vdumpa@nvidia.com> | 2014-03-26 15:38:38 -0700 |
|---|---|---|
| committer | Krishna Reddy <vdumpa@nvidia.com> | 2014-03-26 19:30:17 -0700 |
| commit | ce7c75f27516b3dc942e3112c14814c2caeb1768 (patch) | |
| tree | a5fd9bab29896621690f752c03d2b1eda89245d5 | |
| parent | 10c6d20aab7dccfece5846f98971f7014d736589 (diff) | |
arm: tegra: remove ref to CONFIG_TEGRA_IOVMM_SMMU
Remove references to deprecated CONFIG_TEGRA_IOVMM_SMMU option.
Change-Id: I739c1f8dff68c98d7fe52d1aa45fe9d078ee7648
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/387290
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/devices.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/tegra_smmu.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index bfe2a23fac56..e362bd641d12 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -475,7 +475,7 @@ config TEGRA_AVP_KERNEL_ON_MMU config TEGRA_AVP_KERNEL_ON_SMMU bool "Use SMMU to relocate AVP kernel" - depends on TEGRA_IOVMM_SMMU || TEGRA_IOMMU_SMMU + depends on TEGRA_IOMMU_SMMU default y help Use SMMU to relocate AVP kernel (nvrm_avp.bin). diff --git a/arch/arm/mach-tegra/devices.c b/arch/arm/mach-tegra/devices.c index 8d6476850408..14e624394297 100644 --- a/arch/arm/mach-tegra/devices.c +++ b/arch/arm/mach-tegra/devices.c @@ -1696,7 +1696,7 @@ struct platform_device tegra_gart_device = { }; #endif -#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU) +#if defined(CONFIG_TEGRA_IOMMU_SMMU) static struct resource tegra_smmu_resources[] = { { .name = "mc", diff --git a/arch/arm/mach-tegra/include/mach/tegra_smmu.h b/arch/arm/mach-tegra/include/mach/tegra_smmu.h index 4b702b85197f..29bed4089eed 100644 --- a/arch/arm/mach-tegra/include/mach/tegra_smmu.h +++ b/arch/arm/mach-tegra/include/mach/tegra_smmu.h @@ -20,7 +20,7 @@ int tegra_smmu_save(void); int tegra_smmu_restore(void); -#if defined(CONFIG_TEGRA_IOVMM_SMMU) || defined(CONFIG_TEGRA_IOMMU_SMMU) +#if defined(CONFIG_TEGRA_IOMMU_SMMU) extern struct resource *tegra_smmu_window(int wnum); extern int tegra_smmu_window_count(void); #endif |