diff options
| author | phk <phk@FreeBSD.org> | 2002-09-30 13:49:20 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2002-09-30 13:49:20 +0000 |
| commit | 36e6abee29940066c08bd675ab48859b080eccfd (patch) | |
| tree | f3082c10b039d3f7846f55315512442db8a53538 /sys/dev | |
| parent | 627692f3b0ce706e9da904273b8c3ad92e582708 (diff) | |
| download | FreeBSD-src-36e6abee29940066c08bd675ab48859b080eccfd.zip FreeBSD-src-36e6abee29940066c08bd675ab48859b080eccfd.tar.gz | |
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.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/mcd/mcd.c | 3 | ||||
| -rw-r--r-- | sys/dev/scd/scd.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index ad6c2d9..2891117 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 e26d279..4199f18 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 |
