@@ -251,7 +251,12 @@ CONFIG_AMD_XGBE_DCB=y
CONFIG_AMD_XGBE_HAVE_ECC=y
CONFIG_AMIGA_PARTITION=y
# CONFIG_AMILO_RFKILL is not set
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDERFS=m
+CONFIG_ANDROID_BINDER_DEVICES=""
+CONFIG_ANDROID_BINDER_IPC=m
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
+# CONFIG_ANDROID_VSOC is not set
CONFIG_APDS9300=m
CONFIG_APDS9802ALS=m
CONFIG_APDS9960=m
@@ -531,6 +536,7 @@ CONFIG_ARM_SP805_WATCHDOG=m
CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_TIMER_SP804=y
CONFIG_AS3935=m
+CONFIG_ASHMEM=m
CONFIG_ASN1=y
CONFIG_ASSOCIATIVE_ARRAY=y
# CONFIG_ASUS_LAPTOP is not set
@@ -3954,6 +3960,7 @@ CONFIG_IOMMU_IO_PGTABLE=y
CONFIG_IOMMU_IO_PGTABLE_LPAE=y
# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
CONFIG_IOMMU_SUPPORT=y
+# CONFIG_ION is not set
CONFIG_IOSCHED_BFQ=m
CONFIG_IOSF_MBI=y
CONFIG_IOSF_MBI_DEBUG=y