diff options
| author | ambrisko <ambrisko@FreeBSD.org> | 2004-05-03 22:35:28 +0000 |
|---|---|---|
| committer | ambrisko <ambrisko@FreeBSD.org> | 2004-05-03 22:35:28 +0000 |
| commit | 15b2afd48d4fd4449a185be66041193f610303a5 (patch) | |
| tree | 233941e7057256d325f2e3010220871fc4d82961 /sys/conf | |
| parent | faf8cf3425cc2d36d29a6229e68e8dc1e5d55b86 (diff) | |
| download | FreeBSD-src-15b2afd48d4fd4449a185be66041193f610303a5.zip FreeBSD-src-15b2afd48d4fd4449a185be66041193f610303a5.tar.gz | |
Remove new options and my prevention of system freeze when the sio probe
returns okay when HW probe fails. This happens when comconsole flag is
set but VGA console is used instead.
Back out requested by: bde (He will be looking at other solutions from scratch)
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/conf/options | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index ae900c6..f35b058 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1468,8 +1468,6 @@ options COM_ESP # Code for Hayes ESP. options COM_MULTIPORT # Code for some cards with shared IRQs. options CONSPEED=115200 # Speed for serial console # (default 9600). -options FORCECONSPEED # no matter what use CONSPEED for - # console. # `flags' specific to sio(4). See below for flags used by both sio(4) and # uart(4). diff --git a/sys/conf/options b/sys/conf/options index 7b8abc7..e7717cc 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -522,7 +522,6 @@ BKTR_NEW_MSP34XX_DRIVER opt_bktr.h # options for serial support COM_ESP opt_sio.h COM_MULTIPORT opt_sio.h -FORCECONSPEED opt_sio.h BREAK_TO_DEBUGGER opt_comconsole.h ALT_BREAK_TO_DEBUGGER opt_comconsole.h |
