diff options
| author | Todd Kjos <tkjos@google.com> | 2023-12-06 20:15:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-12-06 20:15:01 +0000 |
| commit | a5e41d29a0d728301c09105f808343f76206211c (patch) | |
| tree | a21fb39917f345a843065abcd5964e70e7127e31 | |
| parent | 8c70330d6d3efc58b7f4bae11d132a141f472d44 (diff) | |
| parent | 2cc1e530a260da3ef5480c87f6a05bba7d22b104 (diff) | |
| download | configs-a5e41d29a0d728301c09105f808343f76206211c.tar.gz | |
Merge "Update v/android-6.6 based on changes since 6.1" into main
| -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 |