Move dkmodpart() from subr_diskslice.c to subr_disklabel.c.

2 files changed, 6 insertions, 6 deletions

diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index 2166fc2..9318ffa 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -50,6 +50,12 @@
 #include <sys/disklabel.h>
 #include <sys/syslog.h>
 
+dev_t
+dkmodpart(dev_t dev, int part)
+{
+	return (makedev(major(dev), (minor(dev) & ~7) | part));
+}
+
 /*
  * Attempt to read a disk label from a device using the indicated strategy
  * routine.  The label must be partly set up before this: secpercyl, secsize
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 000119e..fc27545 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -125,12 +125,6 @@ clone_label(lp)
 }
 
 dev_t
-dkmodpart(dev_t dev, int part)
-{
-	return (makedev(major(dev), (minor(dev) & ~7) | part));
-}
-
-dev_t
 dkmodslice(dev_t dev, int slice)
 {
 	return (makedev(major(dev), (minor(dev) & ~0x1f0000) | (slice << 16)));