diff --git a/.pick_status.json b/.pick_status.json
index 257a1a58543..7ebe3a10b13 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1462,7 +1462,7 @@
         "description": "meson: Remove reference to removed SWR driver",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "e2de00876a7033b6923f912af8d2b0bbd100e113"
     },
diff --git a/meson.build b/meson.build
index ff6fa69114a..372f0a5cbe3 100644
--- a/meson.build
+++ b/meson.build
@@ -1713,7 +1713,7 @@ if with_llvm
 elif with_amd_vk and with_aco_tests
   error('ACO tests require LLVM, but LLVM is disabled.')
 elif with_gallium_radeonsi or with_swrast_vk
-  error('The following drivers require LLVM: RadeonSI, SWR, Lavapipe. One of these is enabled, but LLVM is disabled.')
+  error('The following drivers require LLVM: RadeonSI, Lavapipe. One of these is enabled, but LLVM is disabled.')
 elif with_gallium_opencl
   error('The OpenCL "Clover" state tracker requires LLVM, but LLVM is disabled.')
 elif with_clc