diff --git a/sys/sys/conf.h b/sys/sys/conf.h
index b379433cb3bb..f5efabf1e105 100644
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -155,7 +155,7 @@ void ldisc_deregister __P((int));
  * Swap device table
  */
 struct swdevt {
-	udev_t	sw_dev;
+	dev_t	sw_dev;
 	int	sw_flags;
 	int	sw_nblks;
 	struct	vnode *sw_vp;
diff --git a/sys/sys/linedisc.h b/sys/sys/linedisc.h
index b379433cb3bb..f5efabf1e105 100644
--- a/sys/sys/linedisc.h
+++ b/sys/sys/linedisc.h
@@ -155,7 +155,7 @@ void ldisc_deregister __P((int));
  * Swap device table
  */
 struct swdevt {
-	udev_t	sw_dev;
+	dev_t	sw_dev;
 	int	sw_flags;
 	int	sw_nblks;
 	struct	vnode *sw_vp;
diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c
index 361a3d9325df..605fabf451aa 100644
--- a/sys/vm/vm_swap.c
+++ b/sys/vm/vm_swap.c
@@ -314,7 +314,7 @@ swaponvp(p, vp, dev, nblks)
 	nblks = dbtoc(nblks);
 
 	sp->sw_vp = vp;
-	sp->sw_dev = dev2udev(dev);
+	sp->sw_dev = dev;
 	sp->sw_flags |= SW_FREED;
 	sp->sw_nblks = nblks;