diff --git a/configs/config-4.19.y-aarch64 b/configs/config-4.19.y-aarch64
index c30146f1968e1958d5b20ff6a6f73fe54d2cafb0..33a026bfe5214844220addd2180268177c20dedf 100644
--- a/configs/config-4.19.y-aarch64
+++ b/configs/config-4.19.y-aarch64
@@ -4830,7 +4830,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 # CONFIG_NFS_V2 is not set
 CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
 CONFIG_NFS_V4_1=y
@@ -4846,9 +4846,8 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
+# CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_PNFS=y
 # CONFIG_NFSD_BLOCKLAYOUT is not set
@@ -4859,7 +4858,6 @@ CONFIG_NFSD_V4_SECURITY_LABEL=y
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m
diff --git a/configs/config-4.19.y-aarch64-debug b/configs/config-4.19.y-aarch64-debug
index 6430716acf9c158aefd975f984c8c1242f505c9e..0d45cb6590e274e10aba7b4d0298782e8eea1530 100644
--- a/configs/config-4.19.y-aarch64-debug
+++ b/configs/config-4.19.y-aarch64-debug
@@ -4812,7 +4812,7 @@ CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 # CONFIG_NFS_V2 is not set
 CONFIG_NFS_V3=m
-CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V4=m
 # CONFIG_NFS_SWAP is not set
 CONFIG_NFS_V4_1=y
@@ -4828,9 +4828,8 @@ CONFIG_NFS_FSCACHE=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 CONFIG_NFS_DEBUG=y
 CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
+# CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V4=y
 CONFIG_NFSD_PNFS=y
 # CONFIG_NFSD_BLOCKLAYOUT is not set
@@ -4841,7 +4840,6 @@ CONFIG_NFSD_FAULT_INJECTION=y
 CONFIG_GRACE_PERIOD=m
 CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
-CONFIG_NFS_ACL_SUPPORT=m
 CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=m
 CONFIG_SUNRPC_GSS=m