From: deraadt <deraadt@openbsd.org>
Date: Fri, 7 Apr 2000 13:39:01 +0000 (+0000)
Subject: add DISKMINOR(), and repair redefinitions
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d4be3bd61cbb3c971c71c04f0723e33d057497b8;p=openbsd

add DISKMINOR(), and repair redefinitions
---

diff --git a/sys/arch/mvme68k/include/disklabel.h b/sys/arch/mvme68k/include/disklabel.h
index f2b386c6a9b..792d6406b70 100644
--- a/sys/arch/mvme68k/include/disklabel.h
+++ b/sys/arch/mvme68k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.5 1997/03/31 00:24:00 downsj Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.6 2000/04/07 13:39:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Nivas Madhur
@@ -50,8 +50,6 @@
  */
 #define DISKUNIT(dev)	(minor(dev) / MAXPARTITIONS)
 #define DISKPART(dev)	(minor(dev) % MAXPARTITIONS)
-#define MAKEDISKDEV(maj, unit, part) \
-    (makedev((maj), ((unit) * MAXPARTITIONS) + (part)))
 
 /*
  * a cpu_disklabel is a disklabel that the bug (prom) can understand
diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h
index 7bb8062799f..2d9dba98585 100644
--- a/sys/arch/mvme88k/include/disklabel.h
+++ b/sys/arch/mvme88k/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.4 1999/02/09 06:36:26 smurph Exp $ */
+/*	$OpenBSD: disklabel.h,v 1.5 2000/04/07 13:39:02 deraadt Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1995 Dale Rahn.
@@ -49,8 +49,6 @@
  */
 #define DISKUNIT(dev)	(minor(dev) / MAXPARTITIONS)
 #define DISKPART(dev)	(minor(dev) % MAXPARTITIONS)
-#define MAKEDISKDEV(maj, unit, part) \
-    (makedev((maj), ((unit) * MAXPARTITIONS) + (part)))
 
 /*
  * Note: this structure is exactly 512 bytes in size. If you move fields