From 150b2bdfb2561316c9eac3bf688dda35f6e9eb69 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 30 Sep 2002 13:49:20 +0000
Subject: [PATCH] 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          | 3 +++
 sys/dev/scd/scd.c          | 3 +++
 sys/i386/isa/matcd/matcd.c | 3 +++
 sys/i386/isa/mcd.c         | 3 +++
 sys/i386/isa/scd.c         | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index ad6c2d9dae7..2891117e2a6 100644
--- a/sys/dev/mcd/mcd.c
+++ b/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 */
diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c
index e26d279fbcf..4199f189eef 100644
--- a/sys/dev/scd/scd.c
+++ b/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
diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c
index eda05c3da35..c220acac530 100644
--- a/sys/i386/isa/matcd/matcd.c
+++ b/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 */
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index ad6c2d9dae7..2891117e2a6 100644
--- a/sys/i386/isa/mcd.c
+++ b/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 */
diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c
index e26d279fbcf..4199f189eef 100644
--- a/sys/i386/isa/scd.c
+++ b/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