If GEOM is in the kernel, take these three out. I have no way of

testing any modifications to them, they shouldn't even bother with
disklabels in the first place and they are just plain obsolete old
hardware which should be axed entirely before 5.0-R IMO.

Sponsored by:	DARPA & NAI Labs.

sys/dev/mcd/mcd.c

@@ -1,3 +1,5 @@
+#include "opt_geom.h"
+#ifndef GEOM
 /*
  * Copyright 1993 by Holger Veit (data part)
  * Copyright 1993 by Brian Moore (audio part)
@@ -1823,3 +1825,4 @@ mcd_resume(int unit)
 		return EINVAL;
 	return mcd_play(unit, &cd->lastpb);
 }
+#endif /* GEOM */

sys/dev/scd/scd.c

@@ -1,3 +1,5 @@
+#include "opt_geom.h"
+#ifndef GEOM
 /*-
  * Copyright (c) 1995 Mikael Hybsch
  * All rights reserved.
@@ -1546,3 +1548,4 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te)
 
 	return 0;
 }
+#endif

sys/i386/isa/matcd/matcd.c

@@ -1,3 +1,5 @@
+#include "opt_geom.h"
+#ifndef GEOM
 /*matcd.c--------------------------------------------------------------------
 
 	Matsushita(Panasonic) / Creative CD-ROM Driver	(matcd)
@@ -2701,3 +2703,4 @@ static int matcd_igot(struct ioc_capability * sqp)
 
 /*End of matcd.c*/
 
+#endif /* GEOM */

sys/i386/isa/mcd.c

@@ -1,3 +1,5 @@
+#include "opt_geom.h"
+#ifndef GEOM
 /*
  * Copyright 1993 by Holger Veit (data part)
  * Copyright 1993 by Brian Moore (audio part)
@@ -1823,3 +1825,4 @@ mcd_resume(int unit)
 		return EINVAL;
 	return mcd_play(unit, &cd->lastpb);
 }
+#endif /* GEOM */

sys/i386/isa/scd.c

@@ -1,3 +1,5 @@
+#include "opt_geom.h"
+#ifndef GEOM
 /*-
  * Copyright (c) 1995 Mikael Hybsch
  * All rights reserved.
@@ -1546,3 +1548,4 @@ scd_toc_entry (int unit, struct ioc_read_toc_single_entry *te)
 
 	return 0;
 }
+#endif