summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfsmp <fsmp@FreeBSD.org>1997-04-26 19:07:36 +0000
committerfsmp <fsmp@FreeBSD.org>1997-04-26 19:07:36 +0000
commit7704de811acb8348cb4712f0e0c2c76c0e53ae96 (patch)
treef796e195fc8b895e59c378850d0ab958674b1f1c
parent3558cef4bd35476fb2bc7ac738fe7ede8b899d5f (diff)
downloadFreeBSD-src-7704de811acb8348cb4712f0e0c2c76c0e53ae96.zip
FreeBSD-src-7704de811acb8348cb4712f0e0c2c76c0e53ae96.tar.gz
#if'ed out the '#include "opt_smp.h"' line.
The SMP source was merged into 3.0-current last nite and this broke the make of sbin/dset. Should make things work for non-SMP case. People making SMP kernels will need to edit i386/isa/isa_device.h, re-enabling '#include "opt_smp.h"'. People making SMP worlds will have to punt for now... I'm thinking about the real solution, but for now the goal is to NOT break the world!
-rw-r--r--sys/i386/isa/isa_device.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 4f37cd0..5e4c0bd 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,14 +31,15 @@
* SUCH DAMAGE.
*
* from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91
- * $Id: isa_device.h,v 1.35 1997/02/22 09:36:42 peter Exp $
+ * $Id: isa_device.h,v 1.36 1997/04/26 11:46:02 peter Exp $
*/
#ifndef _I386_ISA_ISA_DEVICE_H_
#define _I386_ISA_ISA_DEVICE_H_
+#if 0
#include "opt_smp.h"
-
+#endif
/*
* ISA Bus Autoconfiguration
*/
OpenPOWER on IntegriCloud