Index: sys/kern/kern_conf.c
===================================================================
--- sys/kern/kern_conf.c
+++ sys/kern/kern_conf.c
@@ -662,9 +662,8 @@
 
 	if ((devsw->d_flags & D_NEEDGIANT) != 0) {
 		if ((devsw->d_flags & D_GIANTOK) == 0) {
-			printf(
-			    "WARNING: Device \"%s\" is Giant locked and may be "
-			    "deleted before FreeBSD 16.0.\n",
+			gone_in(16,
+			    "WARNING: Device \"%s\" is Giant locked and is deprecated.\n"
 			    devsw->d_name == NULL ? "???" : devsw->d_name);
 		}
 		if (devsw->d_gianttrick == NULL) {