Backed out rev.1.43 (removed nonsense SLICE ifdef). SLICE is

normally only defined in opt_devfs.h, so testing it before including
anything is normally a no-op.  Undef'ing DEVFS before including
opt_devfs.h is similarly useless.  OTOH, DEVFS support for sliced
but not SLICEd (despite defined(SLICE)) devices is either harmless
(if there are no such devices, then nothing in this file is used)
or necessary (otherwise).  It even seems to work for sliced cd
devices.
This commit is contained in:
Bruce Evans 1998-07-20 12:37:59 +00:00
parent d0db3de488
commit 1e550e3809

View File

@ -1,6 +1,3 @@
#ifdef SLICE
#undef DEVFS
#endif
/*-
* Copyright (c) 1994 Bruce D. Evans.
* All rights reserved.
@ -46,7 +43,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.47 1998/07/04 22:30:22 julian Exp $
* $Id: subr_diskslice.c,v 1.48 1998/07/11 07:45:42 bde Exp $
*/
#include "opt_devfs.h"