diff --git a/.pick_status.json b/.pick_status.json
index 9627e5e5a4f..94f3580df70 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -694,7 +694,7 @@
         "description": "mesa/main: remove non-existing function prototype",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "a347a0f53fbdd9b607d7eae4a483e62f82c68cb1",
         "notes": null
diff --git a/src/mesa/main/formatquery.h b/src/mesa/main/formatquery.h
index 55c79b88bdc..ce49caf8a79 100644
--- a/src/mesa/main/formatquery.h
+++ b/src/mesa/main/formatquery.h
@@ -26,10 +26,6 @@
 
 #include "util/glheader.h"
 
-size_t
-_mesa_query_samples_for_format(struct gl_context *ctx, GLenum target,
-                               GLenum internalFormat, int samples[16]);
-
 void
 _mesa_query_internal_format_default(struct gl_context *ctx, GLenum target,
                                     GLenum internalFormat, GLenum pname,