Upload New File

device/testing/linux-essential-mata/config-essential-mata.aarch64

@@ -3355,7 +3355,11 @@ CONFIG_USB_F_QDSS=y
 CONFIG_USB_F_CCID=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_SERIAL=y
+<<<<<<< HEAD
 # CONFIG_USB_CONFIGFS_ACM is not set
+=======
+#CONFIG_USB_CONFIGFS_ACM=y
+>>>>>>> Upload New File
 #CONFIG_USB_CONFIGFS_OBEX=y 
 CONFIG_USB_CONFIGFS_NCM=y
 #CONFIG_USB_CONFIGFS_ECM=y
@@ -4408,7 +4412,11 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
+<<<<<<< HEAD
 CONFIG_CONFIGFS_FS=m
+=======
+CONFIG_CONFIGFS_FS=y
+>>>>>>> Upload New File
 CONFIG_MISC_FILESYSTEMS=y
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set