diff --git a/drivers/video/tegra/nvmap/Makefile.memory.configs b/drivers/video/tegra/nvmap/Makefile.memory.configs
index 3c092d37..30e3ced0 100644
--- a/drivers/video/tegra/nvmap/Makefile.memory.configs
+++ b/drivers/video/tegra/nvmap/Makefile.memory.configs
@@ -113,6 +113,9 @@ NVMAP_CONFIG_CACHE_FLUSH_AT_ALLOC := y
 
 # Config for enabling the dma-buf deferred unmapping
 NVMAP_CONFIG_DMABUF_DEFERRED_UNMAPPING := n
+
+#Config for enabling nvmap_register_vidmem_carveout
+NVMAP_CONFIG_VIDMEM_CARVEOUT := n
 ################################################################################
 # Section 3
 # Enable/Disable configs based upon the kernel version
diff --git a/drivers/video/tegra/nvmap/nvmap_init.c b/drivers/video/tegra/nvmap/nvmap_init.c
index ce82286a..cf208024 100644
--- a/drivers/video/tegra/nvmap/nvmap_init.c
+++ b/drivers/video/tegra/nvmap/nvmap_init.c
@@ -181,6 +181,7 @@ found:
 	return NULL;
 }
 
+#ifdef NVMAP_CONFIG_VIDMEM_CARVEOUT
 int nvmap_register_vidmem_carveout(struct device *dma_dev,
 				phys_addr_t base, size_t size)
 {
@@ -204,6 +205,7 @@ int nvmap_register_vidmem_carveout(struct device *dma_dev,
 	return nvmap_create_carveout(vidmem_co);
 }
 EXPORT_SYMBOL(nvmap_register_vidmem_carveout);
+#endif /* NVMAP_CONFIG_VIDMEM_CARVEOUT */
 
 #ifdef CONFIG_TEGRA_VIRTUALIZATION
 static int __init nvmap_populate_ivm_carveout(struct device *dev)