From 291aed2347c5780dff8a075a6e0024cc366e881c Mon Sep 17 00:00:00 2001
From: "Isaac J. Manjarres" <isaacmanjarres@google.com>
Date: Fri, 18 Jul 2025 23:53:05 +0000
Subject: [PATCH] ANDROID: Remove DMA-BUF support from microdroid

Microdroid does not interface with peripherals and therefore does not
need dma-buf support, so remove it.

Bug: 432329937
Change-Id: Ie7adb18bbb796129f7d50eb17a6deba061547981
[isaacmanjarres: resolved contextual merge conflicts from forward
porting from android15-6.6.]
Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com>
---
 arch/arm64/configs/microdroid_defconfig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm64/configs/microdroid_defconfig b/arch/arm64/configs/microdroid_defconfig
index 89e33606bc3f..b304a816248b 100644
--- a/arch/arm64/configs/microdroid_defconfig
+++ b/arch/arm64/configs/microdroid_defconfig
@@ -120,8 +120,6 @@ CONFIG_RTC_CLASS=y
 # CONFIG_RTC_NVMEM is not set
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
-CONFIG_DMABUF_HEAPS=y
-CONFIG_DMABUF_SYSFS_STATS=y
 CONFIG_UIO=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_ARM_PKVM_GUEST=y