video: tegra: nvmap: remove deprecate config flag usage

Remove deprecated config flag CONFIG_TEGRA_IOMM usage.

Change-Id: Ifa5e1f04c60b6ace8c8de3274a46a2934e6f2343
Signed-off-by: Krishna Reddy <vdumpa@nvidia.com>
Reviewed-on: http://git-master/r/387315
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Vandana Salve <vsalve@nvidia.com>

diff --git a/drivers/video/tegra/nvmap/nvmap_handle.c b/drivers/video/tegra/nvmap/nvmap_handle.c
index 6eab5a2ccc36ffb01b58490474b25a7e15dafdea..14dbd239ac14a24e154740eac5a138d5cc1346c9 100644 (file)
--- a/drivers/video/tegra/nvmap/nvmap_handle.c
+++ b/drivers/video/tegra/nvmap/nvmap_handle.c
@@ -347,13 +347,11 @@ int nvmap_alloc_handle(struct nvmap_client *client,
        h->align = max_t(size_t, align, L1_CACHE_BYTES);
        h->kind = kind;
 
-#ifndef CONFIG_TEGRA_IOVMM
        /* convert iovmm requests to generic carveout. */
        if (heap_mask & NVMAP_HEAP_IOVMM) {
                heap_mask = (heap_mask & ~NVMAP_HEAP_IOVMM) |
                            NVMAP_HEAP_CARVEOUT_GENERIC;
        }
-#endif
 
        if (!heap_mask) {
                err = -EINVAL;