diff options
| author | martin <martin@NetBSD.org> | 2006-08-13 19:17:11 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2006-08-13 19:17:11 +0000 |
| commit | b28babedf445221b0bbada655034e513c8a473a7 (patch) | |
| tree | 679b63d0ca7c05a9365a8f115c4a9b374fa11bb2 /sys/dev | |
| parent | 7699ba88512a04ac8a6ff1a853bf65a4f2bed948 (diff) | |
Backout previous - it is already dealt with at the config level.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/dkwedge/dkwedge_bsdlabel.c | 9 | ||||
| -rw-r--r-- | sys/dev/dkwedge/dkwedge_gpt.c | 10 | ||||
| -rw-r--r-- | sys/dev/dkwedge/dkwedge_mbr.c | 11 |
3 files changed, 6 insertions, 24 deletions
diff --git a/sys/dev/dkwedge/dkwedge_bsdlabel.c b/sys/dev/dkwedge/dkwedge_bsdlabel.c index 6ee15881b72..67565222569 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.6 2006/08/13 18:45:08 martin Exp $ */ +/* $NetBSD: dkwedge_bsdlabel.c,v 1.7 2006/08/13 19:17:11 martin Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -86,10 +86,7 @@ */ #include <sys/cdefs.h> -__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 +__KERNEL_RCSID(0, "$NetBSD: dkwedge_bsdlabel.c,v 1.7 2006/08/13 19:17:11 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -480,5 +477,3 @@ 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 d7ff667bc46..569c9df39a3 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.3 2006/08/13 18:45:08 martin Exp $ */ +/* $NetBSD: dkwedge_gpt.c,v 1.4 2006/08/13 19:17:11 martin Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -41,10 +41,7 @@ */ #include <sys/cdefs.h> -__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 +__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.4 2006/08/13 19:17:11 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -312,6 +309,3 @@ 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 50c986fa6ed..1aa02ee2e1d 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.4 2006/08/13 18:45:08 martin Exp $ */ +/* $NetBSD: dkwedge_mbr.c,v 1.5 2006/08/13 19:17:11 martin Exp $ */ /*- * Copyright (c) 2004 The NetBSD Foundation, Inc. @@ -41,11 +41,7 @@ */ #include <sys/cdefs.h> -__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 +__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.5 2006/08/13 19:17:11 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -193,6 +189,3 @@ dkwedge_discover_mbr(struct disk *pdk, struct vnode *vp) } DKWEDGE_DISCOVERY_METHOD_DECL(MBR, 10, dkwedge_discover_mbr); - -#endif - |
