diff options
| author | Todd Kjos <tkjos@google.com> | 2023-12-06 21:34:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-06 21:34:13 +0000 |
| commit | 92d199eeb6309feee01456af880706228f26edd4 (patch) | |
| tree | a21fb39917f345a843065abcd5964e70e7127e31 | |
| parent | 84b7833751e218b391f930a706813e00b762cd96 (diff) | |
| parent | 0ef6dbbe6c2dbd4aa7ed3fe9fca9f531b48378c8 (diff) | |
| download | configs-92d199eeb6309feee01456af880706228f26edd4.tar.gz | |
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>
| -rw-r--r-- | v/android-6.6/android-base.config | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/v/android-6.6/android-base.config b/v/android-6.6/android-base.config index dc54560..55ce57e 100644 --- a/v/android-6.6/android-base.config +++ b/v/android-6.6/android-base.config @@ -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 |