Merge "Update v/android-6.6 based on changes since 6.1" into main am: a5e41d29a0
am: 0ef6dbbe6c
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2861073 Change-Id: I9b45f294114466030c82a4583ff4f8211bf45496 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
92d199eeb6
1 changed files with 1 additions and 3 deletions
|
@ -58,9 +58,9 @@ CONFIG_DM_DEFAULT_KEY=y
|
|||
CONFIG_DM_SNAPSHOT=y
|
||||
CONFIG_DM_VERITY=y
|
||||
CONFIG_DUMMY=y
|
||||
CONFIG_EMBEDDED=y
|
||||
CONFIG_EPOLL=y
|
||||
CONFIG_EVENTFD=y
|
||||
CONFIG_EXPERT=y
|
||||
CONFIG_FILE_LOCKING=y
|
||||
CONFIG_FS_ENCRYPTION=y
|
||||
CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y
|
||||
|
@ -253,8 +253,6 @@ CONFIG_USB_CONFIGFS_F_FS=y
|
|||
CONFIG_USB_CONFIGFS_F_MIDI=y
|
||||
CONFIG_USB_CONFIGFS_UEVENT=y
|
||||
CONFIG_USB_GADGET=y
|
||||
CONFIG_USB_NET_AQC111=y
|
||||
CONFIG_USB_NET_CDC_NCM=y
|
||||
CONFIG_USB_SUPPORT=y
|
||||
CONFIG_UTS_NS=y
|
||||
CONFIG_VETH=y
|
||||
|
|
Loading…
Reference in a new issue