diff --git a/sys/kern/subr_autoconf.c b/sys/kern/subr_autoconf.c
index 80ca68fcf2f9..34ce85234676 100644
--- a/sys/kern/subr_autoconf.c
+++ b/sys/kern/subr_autoconf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.172 2009/03/25 21:48:36 dyoung Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.173 2009/03/28 18:43:20 christos Exp $ */
 
 /*
  * Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.172 2009/03/25 21:48:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.173 2009/03/28 18:43:20 christos Exp $");
 
 #include "opt_ddb.h"
 #include "drvctl.h"
@@ -130,15 +130,13 @@ extern struct splash_progress *splash_progress_state;
  * Autoconfiguration subroutines.
  */
 
-struct pmf_private {
+typedef struct pmf_private {
 	int		pp_nwait;
 	int		pp_nlock;
 	lwp_t		*pp_holder;
 	kmutex_t	pp_mtx;
 	kcondvar_t	pp_cv;
-};
-
-typedef struct pmf_private pmf_private_t;
+} pmf_private_t;
 
 /*
  * ioconf.c exports exactly two names: cfdata and cfroots.  All system