From 4ada5572ad9fb9911e24818d02645428168414bd Mon Sep 17 00:00:00 2001
From: martin <martin@NetBSD.org>
Date: Sun, 13 Aug 2006 18:45:08 +0000
Subject: [PATCH] Make the discovery methods optional (as they were already
 declared in conf/files)

---
 sys/dev/dkwedge/dkwedge_bsdlabel.c |  9 +++++++--
 sys/dev/dkwedge/dkwedge_gpt.c      | 10 ++++++++--
 sys/dev/dkwedge/dkwedge_mbr.c      | 11 +++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/sys/dev/dkwedge/dkwedge_bsdlabel.c b/sys/dev/dkwedge/dkwedge_bsdlabel.c
index 132e47e584ba..6ee15881b72a 100644
--- a/sys/dev/dkwedge/dkwedge_bsdlabel.c
+++ b/sys/dev/dkwedge/dkwedge_bsdlabel.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkwedge_bsdlabel.c,v 1.5 2006/02/25 01:27:20 christos Exp $	*/
+/*	$NetBSD: dkwedge_bsdlabel.c,v 1.6 2006/08/13 18:45:08 martin Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -86,7 +86,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.5 2006/02/25 01:27:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.6 2006/08/13 18:45:08 martin Exp $");
+
+#include "opt_dkwedge.h"
+#ifdef DKWEDGE_METHOD_BSDLABEL
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -477,3 +480,5 @@ dkwedge_discover_bsdlabel(struct disk *pdk, struct vnode *vp)
 }
 
 DKWEDGE_DISCOVERY_METHOD_DECL(BSD44, 5, dkwedge_discover_bsdlabel);
+
+#endif
diff --git a/sys/dev/dkwedge/dkwedge_gpt.c b/sys/dev/dkwedge/dkwedge_gpt.c
index 6d246b8fd9be..d7ff667bc46a 100644
--- a/sys/dev/dkwedge/dkwedge_gpt.c
+++ b/sys/dev/dkwedge/dkwedge_gpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkwedge_gpt.c,v 1.2 2005/12/11 12:21:20 christos Exp $	*/
+/*	$NetBSD: dkwedge_gpt.c,v 1.3 2006/08/13 18:45:08 martin Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.2 2005/12/11 12:21:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.3 2006/08/13 18:45:08 martin Exp $");
+
+#include "opt_dkwedge.h"
+#ifdef DKWEDGE_METHOD_GPT
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -309,3 +312,6 @@ dkwedge_discover_gpt(struct disk *pdk, struct vnode *vp)
 }
 
 DKWEDGE_DISCOVERY_METHOD_DECL(GPT, 0, dkwedge_discover_gpt);
+
+#endif
+
diff --git a/sys/dev/dkwedge/dkwedge_mbr.c b/sys/dev/dkwedge/dkwedge_mbr.c
index 1810e8807249..50c986fa6ed4 100644
--- a/sys/dev/dkwedge/dkwedge_mbr.c
+++ b/sys/dev/dkwedge/dkwedge_mbr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkwedge_mbr.c,v 1.3 2005/12/11 12:21:20 christos Exp $	*/
+/*	$NetBSD: dkwedge_mbr.c,v 1.4 2006/08/13 18:45:08 martin Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.3 2005/12/11 12:21:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.4 2006/08/13 18:45:08 martin Exp $");
+
+#include "opt_dkwedge.h"
+
+#ifdef DKWEDGE_METHOD_MBR
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -189,3 +193,6 @@ dkwedge_discover_mbr(struct disk *pdk, struct vnode *vp)
 }
 
 DKWEDGE_DISCOVERY_METHOD_DECL(MBR, 10, dkwedge_discover_mbr);
+
+#endif
+