summarylogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config18
1 files changed, 7 insertions, 11 deletions
diff --git a/config b/config
index 4d9a951dcb26..ca109937fa3c 100644
--- a/config
+++ b/config
@@ -8045,7 +8045,7 @@ CONFIG_DMA_ENGINE_RAID=y
# DMABUF options
#
CONFIG_SYNC_FILE=y
-# CONFIG_SW_SYNC is not set
+CONFIG_SW_SYNC=y
CONFIG_UDMABUF=y
# CONFIG_DMABUF_MOVE_NOTIFY is not set
# CONFIG_DMABUF_DEBUG is not set
@@ -8280,6 +8280,7 @@ CONFIG_DVB_SP8870=m
#
# Android
#
+CONFIG_ASHMEM=y
# end of Android
CONFIG_LTE_GDM724X=m
@@ -9272,7 +9273,11 @@ CONFIG_USB4=m
#
# Android
#
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
# end of Android
CONFIG_LIBNVDIMM=y
@@ -10622,12 +10627,3 @@ CONFIG_ARCH_USE_MEMTEST=y
# CONFIG_HYPERV_TESTING is not set
# end of Kernel Testing and Coverage
# end of Kernel hacking
-
-# Anbox configs
-CONFIG_ASHMEM=m
-CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=m
-CONFIG_ANDROID_BINDERFS=y
-CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
-CONFIG_SW_SYNC=y
-CONFIG_UHID=m