From b7d8478e80eba8f5e5b85b244c620a51c77a2123 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Sun, 30 Jul 2006 16:49:34 +0000
Subject: [PATCH] Fix an incorrect #ifndef label.  Also remove a now
 unnecessary #include <sys/msgport.h>.

Reported-by: Joe Talbott <josepht@ntelos.net>
---
 sys/sys/disk.h | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 132ad4faf1..671fe882ef 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -39,7 +39,7 @@
  * ----------------------------------------------------------------------------
  *
  * $FreeBSD: src/sys/sys/disk.h,v 1.16.2.3 2001/06/20 16:11:01 scottl Exp $
- * $DragonFly: src/sys/sys/disk.h,v 1.8 2006/07/28 02:17:41 dillon Exp $
+ * $DragonFly: src/sys/sys/disk.h,v 1.9 2006/07/30 16:49:34 dillon Exp $
  */
 
 #ifndef _SYS_DISK_H_
@@ -53,14 +53,10 @@
 #include <sys/diskslice.h>
 #endif
 
-#ifndef _SYS_DISKLABEL
+#ifndef _SYS_DISKLABEL_H_
 #include <sys/disklabel.h>
 #endif
 
-#ifndef _SYS_DISKLABEL
-#include <sys/msgport.h>
-#endif
-
 struct disk {
 	struct dev_ops		*d_dev_ops;	/* our device switch */
 	struct dev_ops		*d_raw_ops;	/* the raw device switch */
-- 
2.28.0