Move opt_sio.h options to conf/options and activate in isa/sio.c

5 files changed, 12 insertions, 13 deletions

diff --git a/sys/conf/options b/sys/conf/options
index 5007d1eac820..802380ecde10 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-#	$Id: options,v 1.134 1999/04/19 14:19:49 peter Exp $
+#	$Id: options,v 1.135 1999/05/05 11:24:15 jb Exp $
 #
 #        On the handling of kernel options   
 # 
@@ -335,6 +335,11 @@ METEOR_SYSTEM_DEFAULT	opt_meteor.h
 METEOR_DEALLOC_PAGES	opt_meteor.h
 METEOR_DEALLOC_ABOVE	opt_meteor.h
 
+# Various mi ISA bus flags
+COM_ESP                 opt_sio.h
+COM_MULTIPORT           opt_sio.h
+EXTRA_SIO               opt_sio.h
+
 # Include tweaks for running under the SimOS machine simulator.
 SIMOS			opt_simos.h
 
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index d3ac8db9c3cf..1553c5cefe8c 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.111 1999/04/13 19:38:10 peter Exp $
+#	$Id: options.i386,v 1.112 1999/04/24 21:46:56 peter Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -26,9 +26,6 @@ AUTO_EOI_1		opt_auto_eoi.h
 AUTO_EOI_2		opt_auto_eoi.h
 BREAK_TO_DEBUGGER	opt_comconsole.h
 CONSPEED		opt_comconsole.h
-COM_ESP			opt_sio.h
-COM_MULTIPORT		opt_sio.h
-EXTRA_SIO		opt_sio.h
 I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
 WLDEBUG			opt_wavelan.h
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 4c5ecf73d229..baab2698f62f 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.236 1999/05/09 10:51:13 phk Exp $
+ *	$Id: sio.c,v 1.237 1999/05/09 13:00:44 phk Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -39,7 +39,7 @@
 #include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_devfs.h"
-/* #include "opt_sio.h" */
+#include "opt_sio.h"
 #include "sio.h"
 /* #include "pnp.h" */
 #define NPNP 0
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
index d3ac8db9c3cf..1553c5cefe8c 100644
--- a/sys/i386/conf/options.i386
+++ b/sys/i386/conf/options.i386
@@ -1,4 +1,4 @@
-#	$Id: options.i386,v 1.111 1999/04/13 19:38:10 peter Exp $
+#	$Id: options.i386,v 1.112 1999/04/24 21:46:56 peter Exp $
 
 DISABLE_PSE
 IDE_DELAY
@@ -26,9 +26,6 @@ AUTO_EOI_1		opt_auto_eoi.h
 AUTO_EOI_2		opt_auto_eoi.h
 BREAK_TO_DEBUGGER	opt_comconsole.h
 CONSPEED		opt_comconsole.h
-COM_ESP			opt_sio.h
-COM_MULTIPORT		opt_sio.h
-EXTRA_SIO		opt_sio.h
 I586_PMC_GUPROF		opt_i586_guprof.h
 WLCACHE			opt_wavelan.h
 WLDEBUG			opt_wavelan.h
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 4c5ecf73d229..baab2698f62f 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: sio.c,v 1.236 1999/05/09 10:51:13 phk Exp $
+ *	$Id: sio.c,v 1.237 1999/05/09 13:00:44 phk Exp $
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
  *	from: i386/isa sio.c,v 1.234
  */
@@ -39,7 +39,7 @@
 #include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_devfs.h"
-/* #include "opt_sio.h" */
+#include "opt_sio.h"
 #include "sio.h"
 /* #include "pnp.h" */
 #define NPNP 0