summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES9
-rw-r--r--sys/conf/files8
-rw-r--r--sys/conf/options2
3 files changed, 7 insertions, 12 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index aa052ecaee03..a0428857b905 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -1275,11 +1275,7 @@ options SES_ENABLE_PASSTHROUGH
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
-# The `pty' device usually turns out to be ``effectively mandatory'',
-# as it is required for `telnetd', `rlogind', `screen', `emacs', and
-# `xterm', among others.
-
-device pty #Pseudo ttys
+device pty #BSD-style compatibility pseudo ttys
device nmdm #back-to-back tty devices
device md #Memory/malloc disk
device ccd #Concatenated disk driver
@@ -1291,9 +1287,6 @@ options LIBICONV
# Size of the kernel message buffer. Should be N * pagesize.
options MSGBUF_SIZE=40960
-# Maximum size of a tty or pty input buffer.
-options TTYHOG=8193
-
#####################################################################
# HARDWARE DEVICE CONFIGURATION
diff --git a/sys/conf/files b/sys/conf/files
index 4e9cfed4ecee..7da9135134f3 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1661,12 +1661,14 @@ kern/sysv_sem.c optional sysvsem
kern/sysv_shm.c optional sysvshm
kern/tty.c standard
kern/tty_compat.c optional compat_43tty
-kern/tty_conf.c standard
kern/tty_cons.c standard
kern/tty_info.c standard
-kern/tty_pts.c optional pty
+kern/tty_inq.c standard
+kern/tty_outq.c standard
+kern/tty_pts.c standard
kern/tty_pty.c optional pty
kern/tty_tty.c standard
+kern/tty_ttydisc.c standard
kern/uipc_accf.c optional inet
kern/uipc_cow.c optional zero_copy_sockets
kern/uipc_debug.c optional ddb
@@ -2354,4 +2356,4 @@ xen/xenbus/xenbus_xs.c optional xen
dev/xen/console/console.c optional xen
dev/xen/console/xencons_ring.c optional xen
dev/xen/blkfront/blkfront.c optional xen
-dev/xen/netfront/netfront.c optional xen \ No newline at end of file
+dev/xen/netfront/netfront.c optional xen
diff --git a/sys/conf/options b/sys/conf/options
index 63f827b5eae0..a8b3723d3537 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -175,7 +175,6 @@ SYSVSEM opt_sysvipc.h
SYSVSHM opt_sysvipc.h
SW_WATCHDOG opt_watchdog.h
TURNSTILE_PROFILING
-TTYHOG opt_tty.h
VFS_AIO
VERBOSE_SYSINIT opt_global.h
WLCACHE opt_wavelan.h
@@ -658,6 +657,7 @@ ISAPNP opt_isa.h
DEV_BPF opt_bpf.h
DEV_MCA opt_mca.h
DEV_CARP opt_carp.h
+DEV_PTY opt_tty.h
DEV_SPLASH opt_splash.h
# EISA support