diff --git a/drivers/platform/tegra/aon/Makefile b/drivers/platform/tegra/aon/Makefile
index 7892d449..77c8dd5c 100644
--- a/drivers/platform/tegra/aon/Makefile
+++ b/drivers/platform/tegra/aon/Makefile
@@ -16,5 +16,8 @@ tegra234-aon-objs += \
     ../tegra-ivc.o \
     tegra-aon-mail.o \
     tegra-aon-module.o \
-    aon-hsp-mbox-client.o \
-    tegra-aon-debug.o
+    aon-hsp-mbox-client.o
+
+ifeq ($(CONFIG_DEBUG_FS), y)
+tegra234-aon-objs += tegra-aon-debug.o
+endif
diff --git a/drivers/platform/tegra/aon/tegra-aon-debug.c b/drivers/platform/tegra/aon/tegra-aon-debug.c
index 59cdcaeb..0b524415 100644
--- a/drivers/platform/tegra/aon/tegra-aon-debug.c
+++ b/drivers/platform/tegra/aon/tegra-aon-debug.c
@@ -787,7 +787,6 @@ clean:
 	return PTR_ERR(d);
 }
 
-#if defined(CONFIG_DEBUG_FS)
 int tegra_aon_debugfs_create(struct tegra_aon *aon)
 {
 	struct tegra_aondbg *aondbg = &aondbg_dev;
@@ -867,4 +866,3 @@ void tegra_aon_debugfs_remove(struct tegra_aon *aon)
 	mbox_free_channel(aondbg->mbox);
 	debugfs_remove_recursive(aondbg->aon_root);
 }
-#endif
diff --git a/drivers/scsi/ufs/ufs-tegra-common.c b/drivers/scsi/ufs/ufs-tegra-common.c
index 16689967..ccce7a87 100644
--- a/drivers/scsi/ufs/ufs-tegra-common.c
+++ b/drivers/scsi/ufs/ufs-tegra-common.c
@@ -36,6 +36,7 @@
 #include "ufs-tegra.h"
 #include "ufs-provision.h"
 
+#ifdef CONFIG_DEBUG_FS
 static void ufs_tegra_init_debugfs(struct ufs_hba *hba)
 {
 	struct dentry *device_root;
@@ -46,6 +47,7 @@ static void ufs_tegra_init_debugfs(struct ufs_hba *hba)
 	if (ufs_tegra->enable_ufs_provisioning)
 		debugfs_provision_init(hba, device_root);
 }
+#endif
 
 static void ufs_tegra_set_clk_div(struct ufs_hba *hba, u32 divider_val)
 {