summaryrefslogtreecommitdiff
path: root/sys/kern/subr_diskslice.c
diff options
context:
space:
mode:
authorJulian Elischer <julian@FreeBSD.org>1998-04-19 23:32:49 +0000
committerJulian Elischer <julian@FreeBSD.org>1998-04-19 23:32:49 +0000
commit3e425b968d4b5478e0e1edda78ca13e0e91fa7fe (patch)
treec74ebd0773f9113f68301b0820a6cf92e299233c /sys/kern/subr_diskslice.c
parent9d66d1d696cc0606cb896c261846c9fddc0b867d (diff)
Notes
Diffstat (limited to 'sys/kern/subr_diskslice.c')
-rw-r--r--sys/kern/subr_diskslice.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 5ffb5db13689..4b11dc62e22d 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -1,3 +1,6 @@
+#ifdef SLICE
+#undef DEVFS
+#endif
/*-
* Copyright (c) 1994 Bruce D. Evans.
* All rights reserved.
@@ -43,7 +46,7 @@
* from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- * $Id: subr_diskslice.c,v 1.41 1998/01/24 02:54:34 eivind Exp $
+ * $Id: subr_diskslice.c,v 1.42 1998/02/15 05:41:31 bde Exp $
*/
#include "opt_devfs.h"