diff --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX
index f47c9d393053..8f2228417a6a 100644
--- a/sys/arch/acorn32/conf/EB7500ATX
+++ b/sys/arch/acorn32/conf/EB7500ATX
@@ -1,4 +1,4 @@
-#	$NetBSD: EB7500ATX,v 1.21 2005/12/07 09:10:11 tsutsui Exp $
+#	$NetBSD: EB7500ATX,v 1.22 2005/12/20 05:35:27 thorpej Exp $
 #
 #	EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"EB7500ATX-$Revision: 1.21 $"
+#ident		"EB7500ATX-$Revision: 1.22 $"
 
 # estimated number of users
 maxusers	32
@@ -284,7 +284,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	cgd	4		# cryptographic disk devices
diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index cdcb4fb82270..d0377aefb337 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.64 2005/12/09 23:34:01 elad Exp $
+# 	$NetBSD: GENERIC,v 1.65 2005/12/20 05:35:27 thorpej Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.64 $"
+#ident		"GENERIC-$Revision: 1.65 $"
 
 # estimated number of users
 maxusers	32
@@ -352,7 +352,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd	2		# concatenated disk devices
diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL
index 9895f6443d73..bb5b9cfdf75d 100644
--- a/sys/arch/acorn32/conf/INSTALL
+++ b/sys/arch/acorn32/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.36 2005/12/07 12:40:46 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.37 2005/12/20 05:35:27 thorpej Exp $
 #
 #	INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"INSTALL-$Revision: 1.36 $"
+#ident		"INSTALL-$Revision: 1.37 $"
 
 # estimated number of users
 maxusers	32
@@ -334,7 +334,6 @@ pseudo-device	loop	1		# network loopback
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	raid	8		# RAIDframe disk driver
diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS
index 29f4338af5cb..f4d77d4d08e4 100644
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: LOWMEM_WSCONS,v 1.37 2005/12/07 09:10:11 tsutsui Exp $
+#	$NetBSD: LOWMEM_WSCONS,v 1.38 2005/12/20 05:35:27 thorpej Exp $
 #
 #	LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -301,7 +301,6 @@ pseudo-device	ppp	2		# PPP
 #pseudo-device	ipfilter 1		# ip filter
 #pseudo-device	strip	4		# STRIP
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC
index 40aab44caab8..5bcfcacbc3c4 100644
--- a/sys/arch/acorn32/conf/NC
+++ b/sys/arch/acorn32/conf/NC
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.36 2005/12/11 12:16:05 christos Exp $
+#	$NetBSD: NC,v 1.37 2005/12/20 05:35:27 thorpej Exp $
 #
 #	NC - with vidcconsole
 #
@@ -265,7 +265,6 @@ pseudo-device	loop	1		# network loopback
 #pseudo-device	ipfilter 1		# ip filter
 #pseudo-device	strip	4		# STRIP
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
diff --git a/sys/arch/acorn32/conf/NC_WSCONS b/sys/arch/acorn32/conf/NC_WSCONS
index 4154f54f7437..ab3ddd8b98ed 100644
--- a/sys/arch/acorn32/conf/NC_WSCONS
+++ b/sys/arch/acorn32/conf/NC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: NC_WSCONS,v 1.42 2005/12/11 12:16:05 christos Exp $
+#	$NetBSD: NC_WSCONS,v 1.43 2005/12/20 05:35:27 thorpej Exp $
 #
 #	NC - with wscons
 #
@@ -300,7 +300,6 @@ pseudo-device	loop	1		# network loopback
 #pseudo-device	ipfilter 1		# ip filter
 #pseudo-device	strip	4		# STRIP
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
diff --git a/sys/arch/acorn32/conf/RPC_WSCONS b/sys/arch/acorn32/conf/RPC_WSCONS
index 9f591d0fcd8f..9e159b2263f3 100644
--- a/sys/arch/acorn32/conf/RPC_WSCONS
+++ b/sys/arch/acorn32/conf/RPC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: RPC_WSCONS,v 1.42 2005/12/07 09:10:11 tsutsui Exp $
+#	$NetBSD: RPC_WSCONS,v 1.43 2005/12/20 05:35:27 thorpej Exp $
 #
 #	RPC_WSCONS -- Full RiscPC config with wscons
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.42 $"
+#ident		"GENERIC-$Revision: 1.43 $"
 
 # estimated number of users
 maxusers	32
@@ -328,7 +328,6 @@ pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 pseudo-device	ccd	2		# concatenated disk devices
 pseudo-device	raid	8		# RAIDframe disk driver
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 90d440a645b9..2472d36fee51 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.77 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.78 2005/12/20 05:35:27 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.77 $"
+#ident 		"GENERIC-$Revision: 1.78 $"
 
 maxusers	32		# estimated number of users
 
@@ -848,7 +848,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/amd64/conf/INSTALL b/sys/arch/amd64/conf/INSTALL
index 6d7877597504..b85638a96cdf 100644
--- a/sys/arch/amd64/conf/INSTALL
+++ b/sys/arch/amd64/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.43 2005/12/07 09:10:12 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.44 2005/12/20 05:35:27 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include	"arch/amd64/conf/std.amd64"
 
-#ident 		"INSTALL-$Revision: 1.43 $"
+#ident 		"INSTALL-$Revision: 1.44 $"
 
 maxusers	32		# estimated number of users
 
@@ -649,7 +649,6 @@ pseudo-device	ppp		2	# Point-to-Point Protocol
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/amd64/conf/SIMICS b/sys/arch/amd64/conf/SIMICS
index 62b2b4b45357..d532239a4134 100644
--- a/sys/arch/amd64/conf/SIMICS
+++ b/sys/arch/amd64/conf/SIMICS
@@ -1,4 +1,4 @@
-#	$NetBSD: SIMICS,v 1.24 2005/12/07 12:40:46 tsutsui Exp $
+#	$NetBSD: SIMICS,v 1.25 2005/12/20 05:35:27 thorpej Exp $
 #
 #	INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -518,6 +518,5 @@ pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals (Sysinst needs two)
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
diff --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC
index 36fb8d0641fb..75c62fdf4ede 100644
--- a/sys/arch/arc/conf/ARCTIC
+++ b/sys/arch/arc/conf/ARCTIC
@@ -1,4 +1,4 @@
-#	$NetBSD: ARCTIC,v 1.40 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: ARCTIC,v 1.41 2005/12/20 05:35:27 thorpej Exp $
 #	$OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
 #
 #	configuration file for DeskStation
@@ -265,7 +265,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 6db8b801b52f..9491a3112749 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.130 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.131 2005/12/20 05:35:27 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/arc/conf/std.arc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.130 $"
+#ident		"GENERIC-$Revision: 1.131 $"
 
 maxusers	32		# estimated number of users
 
@@ -439,7 +439,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arc/conf/M403 b/sys/arch/arc/conf/M403
index 60b3dbde06c8..4bb3b4d10464 100644
--- a/sys/arch/arc/conf/M403
+++ b/sys/arch/arc/conf/M403
@@ -1,4 +1,4 @@
-#	$NetBSD: M403,v 1.37 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: M403,v 1.38 2005/12/20 05:35:27 thorpej Exp $
 #
 #	configuration file for MIPS Magnum 4000 system
 #
@@ -214,7 +214,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arc/conf/MIMORI b/sys/arch/arc/conf/MIMORI
index 903ed880009e..29013318e0e3 100644
--- a/sys/arch/arc/conf/MIMORI
+++ b/sys/arch/arc/conf/MIMORI
@@ -1,4 +1,4 @@
-#	$NetBSD: MIMORI,v 1.42 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: MIMORI,v 1.43 2005/12/20 05:35:27 thorpej Exp $
 #	NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
 #
 #	MIMORI -- My NEC RISCstation 2250 (ur)
@@ -278,7 +278,6 @@ pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arc/conf/PCCONS b/sys/arch/arc/conf/PCCONS
index 620c071b775c..0e7b50b52ae7 100644
--- a/sys/arch/arc/conf/PCCONS
+++ b/sys/arch/arc/conf/PCCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: PCCONS,v 1.50 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: PCCONS,v 1.51 2005/12/20 05:35:27 thorpej Exp $
 #	$OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
 #
 #	PCCONS -- generic but pccons rather than wscons
@@ -360,7 +360,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA
index ef0ecec3376f..569f51ac3836 100644
--- a/sys/arch/arc/conf/PICA
+++ b/sys/arch/arc/conf/PICA
@@ -1,4 +1,4 @@
-#	$NetBSD: PICA,v 1.53 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: PICA,v 1.54 2005/12/20 05:35:27 thorpej Exp $
 #
 #	configuration file for ACER PICA system
 #
@@ -217,7 +217,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index 55e34f37c532..42d820c133ad 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.65 2005/12/07 09:10:12 tsutsui Exp $
+#	$NetBSD: RAMDISK,v 1.66 2005/12/20 05:35:27 thorpej Exp $
 #
 #	memory disk based configuration file for MIPS R4x00 ARC Systems
 #
@@ -7,7 +7,7 @@ include		"arch/arc/conf/std.arc"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.65 $"
+#ident		"GENERIC-$Revision: 1.66 $"
 
 maxusers	32		# estimated number of users
 
@@ -406,7 +406,6 @@ pseudo-device	sl		2	# Serial Line IP
 
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/arc/conf/RPC44 b/sys/arch/arc/conf/RPC44
index 0e27bd9db474..291f3cfbcf5d 100644
--- a/sys/arch/arc/conf/RPC44
+++ b/sys/arch/arc/conf/RPC44
@@ -1,4 +1,4 @@
-# $NetBSD: RPC44,v 1.22 2005/12/07 09:10:12 tsutsui Exp $
+# $NetBSD: RPC44,v 1.23 2005/12/20 05:35:27 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/arc/conf/std.arc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.22 $"
+#ident		"GENERIC-$Revision: 1.23 $"
 
 maxusers	32		# estimated number of users
 
@@ -294,7 +294,6 @@ pseudo-device	tun		2	# network tunneling over tty
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port arc yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 4c72bb22e4a9..5aad98cf54e0 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.97 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.98 2005/12/20 05:35:27 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -587,7 +587,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
diff --git a/sys/arch/cats/conf/INSTALL b/sys/arch/cats/conf/INSTALL
index 989742834dac..21d26ef4a46e 100644
--- a/sys/arch/cats/conf/INSTALL
+++ b/sys/arch/cats/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.55 2005/12/07 12:40:47 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.56 2005/12/20 05:35:27 thorpej Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -465,7 +465,6 @@ pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC
index e532881d4fe8..bf8fdba451e6 100644
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.88 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.89 2005/12/20 05:35:27 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.88 $"
+#ident 		"GENERIC-$Revision: 1.89 $"
 
 maxusers	32
 
@@ -341,7 +341,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # Miscellaneous pseudo-devices
 pseudo-device	pty				# pseudo-terminals
-#pseudo-device	tb		1		# tablet line discipline
 #pseudo-device	sequencer	1		# MIDI sequencer
 pseudo-device	rnd				# /dev/random & kernel generator
 #options 	RND_COM				# use "com" randomness (BROKEN)
diff --git a/sys/arch/cobalt/conf/INSTALL b/sys/arch/cobalt/conf/INSTALL
index 400f10921b92..6c467aaa1dd4 100644
--- a/sys/arch/cobalt/conf/INSTALL
+++ b/sys/arch/cobalt/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.15 2005/12/07 09:10:12 tsutsui Exp $
+# $NetBSD: INSTALL,v 1.16 2005/12/20 05:35:27 thorpej Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.15 $"
+#ident 		"INSTALL-$Revision: 1.16 $"
 
 makeoptions     COPTS="-Os -mmemcpy"
 
@@ -319,7 +319,6 @@ pseudo-device	loop				# network loopback
 
 # Miscellaneous pseudo-devices
 pseudo-device	pty				# pseudo-terminals
-#pseudo-device	tb		1		# tablet line discipline
 #pseudo-device	sequencer	1		# MIDI sequencer
 pseudo-device	rnd				# /dev/random & kernel generator
 #options 	RND_COM				# use "com" randomness (BROKEN)
diff --git a/sys/arch/evbmips/conf/MALTA b/sys/arch/evbmips/conf/MALTA
index 4aa592328ff6..2b352a61fc52 100644
--- a/sys/arch/evbmips/conf/MALTA
+++ b/sys/arch/evbmips/conf/MALTA
@@ -1,10 +1,10 @@
-#	$NetBSD: MALTA,v 1.36 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: MALTA,v 1.37 2005/12/20 05:35:27 thorpej Exp $
 
 include 	"arch/evbmips/conf/std.malta"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MALTA-$Revision: 1.36 $"
+#ident 		"MALTA-$Revision: 1.37 $"
 
 maxusers	32
 
@@ -319,7 +319,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # Miscellaneous pseudo-devices
 pseudo-device	pty				# pseudo-terminals
-#pseudo-device	tb		1		# tablet line discipline
 #pseudo-device	sequencer	1		# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd				# /dev/random & kernel generator
diff --git a/sys/arch/evbmips/conf/PB1000 b/sys/arch/evbmips/conf/PB1000
index 56561f22a45a..916cd7b86a22 100644
--- a/sys/arch/evbmips/conf/PB1000
+++ b/sys/arch/evbmips/conf/PB1000
@@ -1,11 +1,11 @@
-#	$NetBSD: PB1000,v 1.26 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: PB1000,v 1.27 2005/12/20 05:35:27 thorpej Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.pb1000"
 
-#ident 		"PB1000-$Revision: 1.26 $"
+#ident 		"PB1000-$Revision: 1.27 $"
 
 maxusers	32
 
@@ -252,7 +252,6 @@ pseudo-device	bridge				# simple inter-network bridging
 
 # Miscellaneous pseudo-devices
 pseudo-device	pty				# pseudo-terminals
-#pseudo-device	tb		1		# tablet line discipline
 #pseudo-device	sequencer	1		# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd				# /dev/random & kernel generator
diff --git a/sys/arch/evbppc/conf/EXPLORA451 b/sys/arch/evbppc/conf/EXPLORA451
index 9e8c72776ecd..7144781f9d08 100644
--- a/sys/arch/evbppc/conf/EXPLORA451
+++ b/sys/arch/evbppc/conf/EXPLORA451
@@ -1,4 +1,4 @@
-#	$NetBSD: EXPLORA451,v 1.19 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: EXPLORA451,v 1.20 2005/12/20 05:35:27 thorpej Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -195,7 +195,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
 pseudo-device	clockctl		# user control of clock subsystem
diff --git a/sys/arch/evbppc/conf/OPENBLOCKS266 b/sys/arch/evbppc/conf/OPENBLOCKS266
index fa7c4b43fc7d..595d3b3e0c50 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS266
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS266,v 1.27 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: OPENBLOCKS266,v 1.28 2005/12/20 05:35:27 thorpej Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -7,7 +7,7 @@ include		"arch/evbppc/conf/std.obs405"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"OPENBLOCKS266-$Revision: 1.27 $"
+#ident 		"OPENBLOCKS266-$Revision: 1.28 $"
 
 maxusers	32
 
@@ -228,6 +228,5 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	clockctl		# user control of clock subsystem
diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC
index 8a947adcb0cd..feb46635d4f4 100644
--- a/sys/arch/hp700/conf/GENERIC
+++ b/sys/arch/hp700/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.59 2005/12/09 23:34:01 elad Exp $
+# $NetBSD: GENERIC,v 1.60 2005/12/20 05:35:27 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -23,7 +23,7 @@ include 	"arch/hp700/conf/std.hp700"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident 		"GENERIC-$Revision: 1.59 $"
+#ident 		"GENERIC-$Revision: 1.60 $"
 
 maxusers	32		# estimated number of users
 
@@ -563,7 +563,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port hp700 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ
index f37e1aacb6b3..49f16a7c0293 100644
--- a/sys/arch/hpcarm/conf/IPAQ
+++ b/sys/arch/hpcarm/conf/IPAQ
@@ -1,4 +1,4 @@
-#	$NetBSD: IPAQ,v 1.42 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: IPAQ,v 1.43 2005/12/20 05:35:28 thorpej Exp $
 #
 #	iPAQ H3600 -- Windows-CE based PDA
 #
@@ -205,7 +205,6 @@ pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb	1		# tablet line discipline
 #pseudo-device	vnd	4		# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	cgd	2		# cryptographic disk devices
diff --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720
index 5c5808d3b5fe..126233b1c0b2 100644
--- a/sys/arch/hpcarm/conf/JORNADA720
+++ b/sys/arch/hpcarm/conf/JORNADA720
@@ -1,4 +1,4 @@
-#	$NetBSD: JORNADA720,v 1.48 2005/12/07 09:10:13 tsutsui Exp $
+#	$NetBSD: JORNADA720,v 1.49 2005/12/20 05:35:28 thorpej Exp $
 #
 #	JORNADA -- Windows-CE based jornada 720
 #
@@ -7,7 +7,7 @@ include	"arch/hpcarm/conf/std.hpcarm"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.48 $"
+#ident 		"GENERIC-$Revision: 1.49 $"
 
 # estimated number of users
 maxusers	32
@@ -247,7 +247,6 @@ pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
 
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb	1		# tablet line discipline
 #pseudo-device	vnd	4		# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	cgd	2		# cryptographic disk devices
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index d7fd32577737..80c32249b5de 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$NetBSD: DISKLESS,v 1.110 2005/12/11 12:17:40 christos Exp $
+#	$NetBSD: DISKLESS,v 1.111 2005/12/20 05:35:28 thorpej Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
 # This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -261,7 +261,6 @@ pseudo-device	tun	2		# network tunneling over tty
 #pseudo-device	ipfilter		# IP filter
 
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb	1		# tablet line discipline
 #pseudo-device	vnd	4		# paging to files
 #pseudo-device	ccd	4		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 87c7e1b23a36..bce4c8841eae 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.713 2005/12/11 02:11:50 christos Exp $
+# $NetBSD: GENERIC,v 1.714 2005/12/20 05:35:28 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.713 $"
+#ident 		"GENERIC-$Revision: 1.714 $"
 
 maxusers	32		# estimated number of users
 
@@ -1276,7 +1276,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/GENERIC.MPACPI b/sys/arch/i386/conf/GENERIC.MPACPI
index 30b13f09bc5b..9e05a96973b6 100644
--- a/sys/arch/i386/conf/GENERIC.MPACPI
+++ b/sys/arch/i386/conf/GENERIC.MPACPI
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC.MPACPI,v 1.53 2005/12/11 02:11:50 christos Exp $
+#	$NetBSD: GENERIC.MPACPI,v 1.54 2005/12/20 05:35:28 thorpej Exp $
 #
 #	GENERIC.MPACPI -- Generic, plus ACPI Multiprocessor support
 #
@@ -8,7 +8,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.53 $"
+#ident 		"GENERIC-$Revision: 1.54 $"
 
 maxusers	32		# estimated number of users
 
@@ -1226,7 +1226,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP
index c986b1f9571c..f59c3503d455 100644
--- a/sys/arch/i386/conf/GENERIC_LAPTOP
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_LAPTOP,v 1.160 2005/12/11 02:11:50 christos Exp $
+#	$NetBSD: GENERIC_LAPTOP,v 1.161 2005/12/20 05:35:28 thorpej Exp $
 #	From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #	GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.160 $"
+#ident 		"GENERIC-$Revision: 1.161 $"
 
 maxusers	32		# estimated number of users
 
@@ -892,7 +892,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY
index b6f58d7dda07..35cfde3c152d 100644
--- a/sys/arch/i386/conf/GENERIC_TINY
+++ b/sys/arch/i386/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.94 2005/12/07 12:40:47 tsutsui Exp $
+#	$NetBSD: GENERIC_TINY,v 1.95 2005/12/20 05:35:28 thorpej Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -582,7 +582,6 @@ pseudo-device	tun		2	# network tunneling over tty
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
 pseudo-device	clockctl		# user control of clock subsystem
diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL
index 6e5a1d44a8f8..b04879d01abc 100644
--- a/sys/arch/i386/conf/INSTALL
+++ b/sys/arch/i386/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.275 2005/12/07 12:40:47 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.276 2005/12/20 05:35:28 thorpej Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -769,7 +769,6 @@ pseudo-device	sl		2	# Serial Line IP
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
 options NO_DEV_PTM
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/INSTALL_LAPTOP b/sys/arch/i386/conf/INSTALL_LAPTOP
index fc6363c0da68..1ebb431c9822 100644
--- a/sys/arch/i386/conf/INSTALL_LAPTOP
+++ b/sys/arch/i386/conf/INSTALL_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_LAPTOP,v 1.94 2005/12/07 12:40:47 tsutsui Exp $
+#	$NetBSD: INSTALL_LAPTOP,v 1.95 2005/12/20 05:35:28 thorpej Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -564,7 +564,6 @@ pseudo-device	sl		2	# Serial Line IP
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
 options	NO_DEV_PTM	
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/INSTALL_SMALL b/sys/arch/i386/conf/INSTALL_SMALL
index a1a6cfb26dd0..f09411311e63 100644
--- a/sys/arch/i386/conf/INSTALL_SMALL
+++ b/sys/arch/i386/conf/INSTALL_SMALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_SMALL,v 1.122 2005/12/07 12:40:47 tsutsui Exp $
+#	$NetBSD: INSTALL_SMALL,v 1.123 2005/12/20 05:35:28 thorpej Exp $
 #
 #	INSTALL_SMALL - Small Installation kernel.
 #
@@ -497,6 +497,5 @@ pseudo-device	loop			# network loopback
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
 options	NO_DEV_PTM
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY
index d686edffe5f2..8c82cc5f9c94 100644
--- a/sys/arch/i386/conf/INSTALL_TINY
+++ b/sys/arch/i386/conf/INSTALL_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.99 2005/12/07 12:40:47 tsutsui Exp $
+#	$NetBSD: INSTALL_TINY,v 1.100 2005/12/20 05:35:28 thorpej Exp $
 #
 #	This kernel should be derived from INSTALL (which is derived
 #	from GENERIC) with some features commented out.
@@ -503,6 +503,5 @@ pseudo-device	loop			# network loopback
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
 options	NO_DEV_PTM
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well (BROKEN)
diff --git a/sys/arch/i386/conf/INSTALL_XENU b/sys/arch/i386/conf/INSTALL_XENU
index 471ff775ac40..1403d0c848c0 100644
--- a/sys/arch/i386/conf/INSTALL_XENU
+++ b/sys/arch/i386/conf/INSTALL_XENU
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_XENU,v 1.9 2005/12/07 12:40:47 tsutsui Exp $
+# $NetBSD: INSTALL_XENU,v 1.10 2005/12/20 05:35:29 thorpej Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -167,7 +167,6 @@ pseudo-device	sl		2	# Serial Line IP
 
 # miscellaneous pseudo-devices
 pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/IOPENER b/sys/arch/i386/conf/IOPENER
index 8b355f740bb8..8fd63daaf7c0 100644
--- a/sys/arch/i386/conf/IOPENER
+++ b/sys/arch/i386/conf/IOPENER
@@ -1,4 +1,4 @@
-#	$NetBSD: IOPENER,v 1.70 2005/12/17 16:15:01 tsutsui Exp $
+#	$NetBSD: IOPENER,v 1.71 2005/12/20 05:35:29 thorpej Exp $
 #
 #	IOPENER -- GENERIC-like kernel for the Netpliance i-opener
 #	from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"IOPENER-$Revision: 1.70 $"
+#ident 		"IOPENER-$Revision: 1.71 $"
 
 maxusers	32		# estimated number of users
 
@@ -440,7 +440,6 @@ pseudo-device	sl		2	# Serial Line IP
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/LAMB b/sys/arch/i386/conf/LAMB
index 93f1845b9292..40f120af73dc 100644
--- a/sys/arch/i386/conf/LAMB
+++ b/sys/arch/i386/conf/LAMB
@@ -1,4 +1,4 @@
-#	$NetBSD: LAMB,v 1.58 2005/12/07 09:10:15 tsutsui Exp $
+#	$NetBSD: LAMB,v 1.59 2005/12/20 05:35:29 thorpej Exp $
 #
 #	LAMB - a complete kernel for wildlab LAMB, http://www.wildlab.com/
 #
@@ -393,7 +393,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501
index 5ba8178adb60..2df7eee24ae8 100644
--- a/sys/arch/i386/conf/NET4501
+++ b/sys/arch/i386/conf/NET4501
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.44 2005/12/07 12:40:47 tsutsui Exp $
+# $NetBSD: NET4501,v 1.45 2005/12/20 05:35:29 thorpej Exp $
 #
 # NET4501 -- kernel configuration for a Soekris Engineering net4501
 # single-board computer.
@@ -10,7 +10,7 @@ include 	"arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"NET4501-$Revision: 1.44 $"
+#ident 		"NET4501-$Revision: 1.45 $"
 
 maxusers	32		# estimated number of users
 
@@ -284,7 +284,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/SWINGER b/sys/arch/i386/conf/SWINGER
index 88c4410284dd..14418fe9a425 100644
--- a/sys/arch/i386/conf/SWINGER
+++ b/sys/arch/i386/conf/SWINGER
@@ -1,4 +1,4 @@
-#	$NetBSD: SWINGER,v 1.76 2005/12/07 09:10:15 tsutsui Exp $
+#	$NetBSD: SWINGER,v 1.77 2005/12/20 05:35:29 thorpej Exp $
 #	from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp
 #
 #	SWINGER -- thorpej's Abit BP6+dual Celeron
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"SWINGER-$Revision: 1.76 $"
+#ident 		"SWINGER-$Revision: 1.77 $"
 
 maxusers	64		# estimated number of users
 
@@ -799,7 +799,6 @@ pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/VIRTUALPC b/sys/arch/i386/conf/VIRTUALPC
index 6f902d33a5fc..9754c72c5cbd 100644
--- a/sys/arch/i386/conf/VIRTUALPC
+++ b/sys/arch/i386/conf/VIRTUALPC
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTUALPC,v 1.34 2005/12/11 02:11:50 christos Exp $
+# $NetBSD: VIRTUALPC,v 1.35 2005/12/20 05:35:29 thorpej Exp $
 #
 # VIRTUALPC machine description file --
 #
@@ -11,7 +11,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"VIRTUALPC-$Revision: 1.34 $"
+#ident 		"VIRTUALPC-$Revision: 1.35 $"
 
 maxusers	32		# estimated number of users
 
@@ -629,7 +629,6 @@ pseudo-device	vlan			# IEEE 802.1q encapsulation
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/i386/conf/XEN0 b/sys/arch/i386/conf/XEN0
index 3bfceb2a0131..1468bb474606 100644
--- a/sys/arch/i386/conf/XEN0
+++ b/sys/arch/i386/conf/XEN0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN0,v 1.23 2005/12/07 09:10:15 tsutsui Exp $
+# $NetBSD: XEN0,v 1.24 2005/12/20 05:35:29 thorpej Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -677,7 +677,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 # rnd works; RND_COM does not on port i386 yet.
 pseudo-device	rnd			# /dev/random and in-kernel generator
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 8d9214d430cf..3f33ff338ea0 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.167 2005/12/09 23:34:02 elad Exp $
+# $NetBSD: GENERIC,v 1.168 2005/12/20 05:35:29 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/mac68k/conf/std.mac68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.167 $"
+#ident 		"GENERIC-$Revision: 1.168 $"
 
 maxusers	16		# estimated number of users
 
@@ -339,7 +339,6 @@ pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	grf		2	# grf emulation for wscons
 pseudo-device	ite		1	# ite emulation for wscons
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	clockctl		# user control of clock subsystem
 
 # random number generator pseudo-device
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index b4cfd1126265..370c39114d93 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERICSBC,v 1.49 2005/12/07 09:10:16 tsutsui Exp $
+#	$NetBSD: GENERICSBC,v 1.50 2005/12/20 05:35:29 thorpej Exp $
 #
 # GENERICSBC
 
@@ -6,7 +6,7 @@ include	"arch/mac68k/conf/std.mac68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERICSBC-$Revision: 1.49 $"
+#ident 		"GENERICSBC-$Revision: 1.50 $"
 
 maxusers	16		# estimated number of users
 
@@ -315,7 +315,6 @@ pseudo-device	bridge			# simple inter-network bridging
 pseudo-device	grf		2	# grf emulation for wscons
 pseudo-device	ite		1	# ite emulation for wscons
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	clockctl		# user control of clock subsystem
 
 # random number generator pseudo-device
diff --git a/sys/arch/mac68k/conf/SMALLRAM b/sys/arch/mac68k/conf/SMALLRAM
index 0c62626cc48d..23e79352a208 100644
--- a/sys/arch/mac68k/conf/SMALLRAM
+++ b/sys/arch/mac68k/conf/SMALLRAM
@@ -1,4 +1,4 @@
-#	$NetBSD: SMALLRAM,v 1.23 2005/12/07 09:10:16 tsutsui Exp $
+#	$NetBSD: SMALLRAM,v 1.24 2005/12/20 05:35:29 thorpej Exp $
 #
 # This is an example of how to configure a small, efficient kernel for a
 # system with limited RAM. Even so it's capable of doing quite a bit. The
@@ -13,7 +13,7 @@ include	"arch/mac68k/conf/std.mac68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"SMALLRAM-$Revision: 1.23 $"
+#ident 		"SMALLRAM-$Revision: 1.24 $"
 
 maxusers	8
 
@@ -304,7 +304,6 @@ pseudo-device	tun		2	# network tunneling over tty
 pseudo-device	grf		2	# grf emulation for wscons
 pseudo-device	ite		1	# ite emulation for wscons
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	clockctl		# user control of clock subsystem
 
 # rnd is EXPERIMENTAL at this point.
diff --git a/sys/arch/mmeye/conf/MMTA b/sys/arch/mmeye/conf/MMTA
index 8228510b08b2..30bfa370f621 100644
--- a/sys/arch/mmeye/conf/MMTA
+++ b/sys/arch/mmeye/conf/MMTA
@@ -1,4 +1,4 @@
-#	$NetBSD: MMTA,v 1.31 2005/12/07 09:10:16 tsutsui Exp $
+#	$NetBSD: MMTA,v 1.32 2005/12/20 05:35:29 thorpej Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -219,7 +219,6 @@ pseudo-device	tun		2	# network tunneling over tty
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	clockctl		# user control of clock subsystem
 
 # rnd is EXPERIMENTAL at this point.
diff --git a/sys/arch/mmeye/conf/MMTAICE b/sys/arch/mmeye/conf/MMTAICE
index db127d4a9996..9e919a333a02 100644
--- a/sys/arch/mmeye/conf/MMTAICE
+++ b/sys/arch/mmeye/conf/MMTAICE
@@ -1,4 +1,4 @@
-#	$NetBSD: MMTAICE,v 1.33 2005/12/07 09:10:16 tsutsui Exp $
+#	$NetBSD: MMTAICE,v 1.34 2005/12/20 05:35:29 thorpej Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -245,7 +245,6 @@ pseudo-device	tun		2	# network tunneling over tty
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	clockctl		# user control of clock subsystem
 
 # rnd is EXPERIMENTAL at this point.
diff --git a/sys/arch/mmeye/conf/MMTAROMNEW b/sys/arch/mmeye/conf/MMTAROMNEW
index 88201dc9efaf..32efc8203698 100644
--- a/sys/arch/mmeye/conf/MMTAROMNEW
+++ b/sys/arch/mmeye/conf/MMTAROMNEW
@@ -1,4 +1,4 @@
-#	$NetBSD: MMTAROMNEW,v 1.33 2005/12/07 09:10:16 tsutsui Exp $
+#	$NetBSD: MMTAROMNEW,v 1.34 2005/12/20 05:35:29 thorpej Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -223,7 +223,6 @@ include	"arch/mmeye/conf/GENERIC.local"
 
 # miscellaneous pseudo-devices
 #pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 pseudo-device	clockctl		# user control of clock subsystem
 
 # rnd is EXPERIMENTAL at this point.
diff --git a/sys/arch/mvmeppc/conf/MVME1600 b/sys/arch/mvmeppc/conf/MVME1600
index 2391bc0b061f..2184b09d2f97 100644
--- a/sys/arch/mvmeppc/conf/MVME1600
+++ b/sys/arch/mvmeppc/conf/MVME1600
@@ -1,11 +1,11 @@
-# $NetBSD: MVME1600,v 1.21 2005/12/07 09:10:16 tsutsui Exp $
+# $NetBSD: MVME1600,v 1.22 2005/12/20 05:35:29 thorpej Exp $
 #
 
 include 	"arch/mvmeppc/conf/std.mvmeppc"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"MVME1600-$Revision: 1.21 $"
+#ident		"MVME1600-$Revision: 1.22 $"
 
 maxusers	8
 
@@ -242,7 +242,6 @@ pseudo-device	loop			# network loopback
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well
diff --git a/sys/arch/pdp10/conf/GENERIC b/sys/arch/pdp10/conf/GENERIC
index 59d41e8d44c3..1735b4b458ab 100644
--- a/sys/arch/pdp10/conf/GENERIC
+++ b/sys/arch/pdp10/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.21 2005/12/09 23:34:03 elad Exp $
+# $NetBSD: GENERIC,v 1.22 2005/12/20 05:35:29 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/pdp10/conf/std.pdp10"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.21 $"
+#ident 		"GENERIC-$Revision: 1.22 $"
 
 # Here are all different supported CPU types listed.
 options 	KL10
@@ -156,7 +156,6 @@ hp*		at rh? drive?		# RM/RP disk drives
 #pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	vlan			# IEEE 802.1q encapsulation
 #pseudo-device	bridge			# simple inter-network bridging
-#pseudo-device	tb	1
 #pseudo-device	vnd	4
 #options 	VND_COMPRESSION		# compressed vnd(4)
 #pseudo-device	ccd	4
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index 8ef83946382a..1fb6640e7b69 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.107 2005/12/09 23:34:03 elad Exp $
+# $NetBSD: GENERIC,v 1.108 2005/12/20 05:35:29 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -24,7 +24,7 @@ options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
 makeoptions	COPTS="-Os -mmultiple"	# -Os -mmultiple to reduce size.
 
-#ident		"GENERIC-$Revision: 1.107 $"
+#ident		"GENERIC-$Revision: 1.108 $"
 
 maxusers	32
 
@@ -550,7 +550,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 #options 	RND_COM			# use "com" randomness as well
diff --git a/sys/arch/sbmips/conf/GENERIC b/sys/arch/sbmips/conf/GENERIC
index 930b2eb54889..3d2e4a2ff9a0 100644
--- a/sys/arch/sbmips/conf/GENERIC
+++ b/sys/arch/sbmips/conf/GENERIC
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.48 2005/12/09 23:34:03 elad Exp $
+# $NetBSD: GENERIC,v 1.49 2005/12/20 05:35:29 thorpej Exp $
 
 include 	"arch/sbmips/conf/std.sbmips"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.48 $"
+#ident 		"GENERIC-$Revision: 1.49 $"
 
 #options 	LOCKDEBUG	# XXX XXX XXX XXX
 #options 	DEBUG		# extra kernel debugging support
@@ -189,7 +189,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # Miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb		1	# tablet line discipline
 #pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random & kernel generator
 pseudo-device	clockctl		# user control of clock subsystem
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x
index 23994d646d02..8660f9fc3311 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP2x,v 1.41 2005/12/10 14:41:17 tsutsui Exp $
+#	$NetBSD: GENERIC32_IP2x,v 1.42 2005/12/20 05:35:30 thorpej Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@ makeoptions	TEXTADDR=0x88069000	# entry point
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32-IP2x-$Revision: 1.41 $"
+#ident		"GENERIC32-IP2x-$Revision: 1.42 $"
 
 maxusers	32
 
@@ -297,7 +297,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	clockctl		# user control of clock subsystem
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x
index 9e637b2823b7..2232ee856e1c 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.43 2005/12/10 14:41:17 tsutsui Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.44 2005/12/20 05:35:30 thorpej Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@ makeoptions	TEXTADDR="0x80069000"	# entry point
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32_IP3x-$Revision: 1.43 $"
+#ident		"GENERIC32_IP3x-$Revision: 1.44 $"
 
 maxusers	32
 
@@ -437,7 +437,6 @@ pseudo-device	bridge			# simple inter-network bridging
 
 # miscellaneous pseudo-devices
 pseudo-device	pty			# pseudo-terminals
-pseudo-device	tb		1	# tablet line discipline
 pseudo-device	sequencer	1	# MIDI sequencer
 pseudo-device	rnd			# /dev/random and in-kernel generator
 pseudo-device	clockctl		# user control of clock subsystem
diff --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC
index fa011b58be38..f49e36b97063 100644
--- a/sys/arch/shark/conf/GENERIC
+++ b/sys/arch/shark/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.55 2005/12/09 23:34:03 elad Exp $
+#	$NetBSD: GENERIC,v 1.56 2005/12/20 05:35:30 thorpej Exp $
 #
 # Generic Shark configuration.
 #
@@ -7,7 +7,7 @@ include	"arch/shark/conf/std.shark"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.55 $"
+#ident		"GENERIC-$Revision: 1.56 $"
 
 # estimated number of users
 maxusers	32
@@ -297,7 +297,6 @@ pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
 #pseudo-device	stf	1		# 6to4 IPv6 over IPv4 encapsulation
 #pseudo-device	strip	4		# STarmode Radio IP (Metricon Ricochet)
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 #options 	VND_COMPRESSION		# compressed vnd(4)
 #pseudo-device	ccd	2		# concatenated disk devices
diff --git a/sys/arch/shark/conf/INSTALL b/sys/arch/shark/conf/INSTALL
index d31a06160c9b..26257fa9d567 100644
--- a/sys/arch/shark/conf/INSTALL
+++ b/sys/arch/shark/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.24 2005/12/07 12:40:47 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.25 2005/12/20 05:35:30 thorpej Exp $
 #
 #	Shark installation kernel
 #
@@ -210,7 +210,6 @@ pseudo-device	bpfilter 8		# packet filter
 #pseudo-device	ipfilter 1		# ip filter
 
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 #pseudo-device	vnd	4		# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
diff --git a/sys/arch/shark/conf/OFWGENCFG b/sys/arch/shark/conf/OFWGENCFG
index a2e98daae712..ba2d36909705 100644
--- a/sys/arch/shark/conf/OFWGENCFG
+++ b/sys/arch/shark/conf/OFWGENCFG
@@ -1,4 +1,4 @@
-#	$NetBSD: OFWGENCFG,v 1.23 2005/12/07 09:10:19 tsutsui Exp $
+#	$NetBSD: OFWGENCFG,v 1.24 2005/12/20 05:35:30 thorpej Exp $
 #
 #	OFWGENCFG: 'generic' configuration for Open Firmware boards.
 #
@@ -144,7 +144,6 @@ pseudo-device	bpfilter 8		# packet filter
 #pseudo-device	ipfilter 1		# ip filter
 
 pseudo-device	pty			# pseudo-terminals
-#pseudo-device	tb	1		# tablet line discipline
 pseudo-device	vnd	4		# disk-like interface to files
 #pseudo-device	ccd	2		# concatenated disk devices
 #pseudo-device	fss	4		# file system snapshot device
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index b3db0031a0f0..49216c194046 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.145 2005/12/09 23:34:03 elad Exp $
+# $NetBSD: GENERIC,v 1.146 2005/12/20 05:35:30 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/vax/conf/std.vax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.145 $"
+#ident 		"GENERIC-$Revision: 1.146 $"
 
 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@@ -309,7 +309,6 @@ pseudo-device	gif	4		# IPv[46] over IPv[46] tunnel (RFC1933)
 pseudo-device	vlan			# IEEE 802.1q encapsulation
 pseudo-device	bridge			# simple inter-network bridging
 #options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
-pseudo-device	tb	1
 pseudo-device	vnd	4
 #options 	VND_COMPRESSION		# compressed vnd(4)
 pseudo-device	ccd	4
diff --git a/sys/arch/vax/conf/INSTALL b/sys/arch/vax/conf/INSTALL
index 7af89e336303..fbf35e95e26b 100644
--- a/sys/arch/vax/conf/INSTALL
+++ b/sys/arch/vax/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.41 2005/12/07 12:40:48 tsutsui Exp $
+#	$NetBSD: INSTALL,v 1.42 2005/12/20 05:35:30 thorpej Exp $
 #
 # INSTALL kernel; all supported devices but nothing fancy.
 #
@@ -212,7 +212,6 @@ pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
 #pseudo-device	bpfilter 8	# Not supported by de yet.
 #pseudo-device	tun	2
 #pseudo-device	gre		2	# generic L3 over IP tunnel
-#pseudo-device	tb	1
 #pseudo-device	vnd	4
 #pseudo-device	ccd	4
 #pseudo-device	raid	4		# RAIDframe disk driver
diff --git a/sys/conf/files b/sys/conf/files
index 02f4b5ebb6b1..84cc94f1f6b5 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.746 2005/12/07 00:42:03 thorpej Exp $
+#	$NetBSD: files,v 1.747 2005/12/20 05:35:30 thorpej Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -1069,7 +1069,6 @@ defpseudo md:		disk
 defpseudo fss:		disk
 
 defpseudo pty:		tty
-defpseudo tb:		tty
 defpseudo rnd
 defpseudo ksyms
 defpseudo nullcons
@@ -1266,7 +1265,6 @@ file	kern/tty_bsdpty.c		compat_bsdpty
 file	kern/tty_pty.c			pty 			needs-flag
 file	kern/tty_ptm.c			pty
 file	kern/tty_subr.c
-file	kern/tty_tb.c			tb			needs-count
 file	kern/tty_tty.c
 file	kern/uipc_domain.c
 file	kern/uipc_mbuf.c
diff --git a/sys/kern/tty_tb.c b/sys/kern/tty_tb.c
deleted file mode 100644
index 5bc9b5e2ec53..000000000000
--- a/sys/kern/tty_tb.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/*	$NetBSD: tty_tb.c,v 1.35 2005/12/11 12:24:30 christos Exp $	*/
-
-/*-
- * Copyright (c) 1982, 1986, 1991, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tty_tb.c	8.2 (Berkeley) 1/9/95
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tty_tb.c,v 1.35 2005/12/11 12:24:30 christos Exp $");
-
-#include "tb.h"
-
-/*
- * Line discipline for RS232 tablets;
- * supplies binary coordinate data.
- */
-#include <sys/param.h>
-#include <sys/tablet.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/ioctl.h>
-#include <sys/ioctl_compat.h>
-#include <sys/tty.h>
-#include <sys/proc.h>
-
-union tbpos {
-	struct	hitpos hitpos;
-	struct	gtcopos gtcopos;
-	struct	polpos polpos;
-};
-
-/*
- * Tablet configuration table.
- */
-struct	tbconf {
-	short	tbc_recsize;	/* input record size in bytes */
-	short	tbc_uiosize;	/* size of data record returned user */
-	int	tbc_sync;	/* mask for finding sync byte/bit */
-				/* decoding routine */
-    	void    (*tbc_decode)(const struct tbconf *, char *, union tbpos *);
-	const u_char	*tbc_run;	/* enter run mode sequence */
-	const u_char	*tbc_point;	/* enter point mode sequence */
-	const u_char	*tbc_stop;	/* stop sequence */
-	const u_char	*tbc_start;	/* start/restart sequence */
-	int	tbc_flags;
-#define	TBF_POL		0x1	/* polhemus hack */
-#define	TBF_INPROX	0x2	/* tablet has proximity info */
-};
-
-static void gtcodecode(const struct tbconf *, char *, union tbpos *);
-static void tbolddecode(const struct tbconf *, char *, union tbpos *);
-static void tblresdecode(const struct tbconf *, char *, union tbpos *);
-static void tbhresdecode(const struct tbconf *, char *, union tbpos *);
-static void poldecode(const struct tbconf *, char *, union tbpos *);
-
-
-static const struct	tbconf tbconf[TBTYPE] = {
-{ 0 },
-{ 5, sizeof(struct hitpos), 0200, tbolddecode, "6", "4" },
-{ 5, sizeof(struct hitpos), 0200, tbolddecode, "\1CN", "\1RT", "\2", "\4" },
-{ 8, sizeof(struct gtcopos), 0200, gtcodecode },
-{17, sizeof(struct polpos), 0200, poldecode, 0, 0, "\21", "\5\22\2\23",
-  TBF_POL },
-{ 5, sizeof(struct hitpos), 0100, tblresdecode, "\1CN", "\1PT", "\2", "\4",
-  TBF_INPROX },
-{ 6, sizeof(struct hitpos), 0200, tbhresdecode, "\1CN", "\1PT", "\2", "\4",
-  TBF_INPROX },
-{ 5, sizeof(struct hitpos), 0100, tblresdecode, "\1CL\33", "\1PT\33", 0, 0},
-{ 6, sizeof(struct hitpos), 0200, tbhresdecode, "\1CL\33", "\1PT\33", 0, 0},
-};
-
-/*
- * Tablet state
- */
-struct tb {
-	int	tbflags;		/* mode & type bits */
-#define	TBMAXREC	17	/* max input record size */
-	char	cbuf[TBMAXREC];		/* input buffer */
-	int	tbinbuf;
-	char	*tbcp;
-	union	tbpos tbpos;
-} tb[NTB];
-
-
-int	tbopen(dev_t, struct tty *);
-int	tbclose(struct tty *, int);
-int	tbread(struct tty *, struct uio *, int);
-int	tbinput(int, struct tty *);
-int	tbtioctl(struct tty *, u_long, caddr_t, int, struct lwp *);
-void	tbattach(int);
-
-static struct linesw tablet_disc = {
-	.l_name = "tablet",
-	.l_open = tbopen,
-	.l_close = tbclose,
-	.l_read = tbread,
-	.l_write = ttyerrio,
-	.l_ioctl = tbtioctl,
-	.l_rint = tbinput,
-	.l_start = ttstart,
-	.l_modem = nullmodem,
-	.l_poll = ttyerrpoll
-};
-
-/*
- * Open as tablet discipline; called on discipline change.
- */
-/*ARGSUSED*/
-int
-tbopen(dev_t dev, struct tty *tp)
-{
-	struct tb *tbp;
-
-	if (tp->t_linesw == &tablet_disc)
-		return (ENODEV);
-	ttywflush(tp);
-	for (tbp = tb; tbp < &tb[NTB]; tbp++)
-		if (tbp->tbflags == 0)
-			break;
-	if (tbp >= &tb[NTB])
-		return (EBUSY);
-	tbp->tbflags = TBTIGER|TBPOINT;		/* default */
-	tbp->tbcp = tbp->cbuf;
-	tbp->tbinbuf = 0;
-	memset((caddr_t)&tbp->tbpos, 0, sizeof(tbp->tbpos));
-	tp->t_sc = (caddr_t)tbp;
-	tp->t_flags |= LITOUT;
-	return (0);
-}
-
-/*
- * Line discipline change or last device close.
- */
-int
-tbclose(struct tty *tp, int flag)
-{
-	int modebits = TBPOINT|TBSTOP;
-
-	return (tbtioctl(tp, BIOSMODE, (caddr_t) &modebits, 0, curlwp));
-}
-
-/*
- * Read from a tablet line.
- * Characters have been buffered in a buffer and decoded.
- */
-int
-tbread(struct tty *tp, struct uio *uio, int flag)
-{
-	struct tb *tbp = (struct tb *)tp->t_sc;
-	const struct tbconf *tc = &tbconf[tbp->tbflags & TBTYPE];
-	int ret;
-
-	if ((tp->t_state&TS_CARR_ON) == 0)
-		return (EIO);
-	ret = uiomove((caddr_t) &tbp->tbpos, tc->tbc_uiosize, uio);
-	if (tc->tbc_flags&TBF_POL)
-		tbp->tbpos.polpos.p_key = ' ';
-	return (ret);
-}
-
-/*
- * Low level character input routine.
- * Stuff the character in the buffer, and decode
- * if all the chars are there.
- *
- * This routine could be expanded in-line in the receiver
- * interrupt routine to make it run as fast as possible.
- */
-int
-tbinput(int c, struct tty *tp)
-{
-	struct tb *tbp = (struct tb *)tp->t_sc;
-	const struct tbconf *tc = &tbconf[tbp->tbflags & TBTYPE];
-
-	if (tc->tbc_recsize == 0 || tc->tbc_decode == 0)	/* paranoid? */
-		return (0);
-	/*
-	 * Locate sync bit/byte or reset input buffer.
-	 */
-	if (c&tc->tbc_sync || tbp->tbinbuf == tc->tbc_recsize) {
-		tbp->tbcp = tbp->cbuf;
-		tbp->tbinbuf = 0;
-	}
-	*tbp->tbcp++ = c&0177;
-	/*
-	 * Call decode routine only if a full record has been collected.
-	 */
-	if (++tbp->tbinbuf == tc->tbc_recsize)
-		(*tc->tbc_decode)(tc, tbp->cbuf, &tbp->tbpos);
-
-	return (0);
-}
-
-/*
- * Decode GTCO 8 byte format (high res, tilt, and pressure).
- */
-static void
-gtcodecode(const struct tbconf *tc, char *cp, union tbpos *u)
-{
-	struct gtcopos *pos = &u->gtcopos;
-	pos->pressure = *cp >> 2;
-	pos->status = (pos->pressure > 16) | TBINPROX; /* half way down */
-	pos->xpos = (*cp++ & 03) << 14;
-	pos->xpos |= *cp++ << 7;
-	pos->xpos |= *cp++;
-	pos->ypos = (*cp++ & 03) << 14;
-	pos->ypos |= *cp++ << 7;
-	pos->ypos |= *cp++;
-	pos->xtilt = *cp++;
-	pos->ytilt = *cp++;
-	pos->scount++;
-}
-
-/*
- * Decode old Hitachi 5 byte format (low res).
- */
-static void
-tbolddecode(const struct tbconf *tc, char *cp, union tbpos *u)
-{
-	struct hitpos *pos = &u->hitpos;
-	char byte;
-
-	byte = *cp++;
-	pos->status = (byte&0100) ? TBINPROX : 0;
-	byte &= ~0100;
-	if (byte > 036)
-		pos->status |= 1 << ((byte-040)/2);
-	pos->xpos = *cp++ << 7;
-	pos->xpos |= *cp++;
-	if (pos->xpos < 256)			/* tablet wraps around at 256 */
-		pos->status &= ~TBINPROX;	/* make it out of proximity */
-	pos->ypos = *cp++ << 7;
-	pos->ypos |= *cp++;
-	pos->scount++;
-}
-
-/*
- * Decode new Hitach 5-byte format (low res).
- */
-static void
-tblresdecode(const struct tbconf *tc, char *cp, union tbpos *u)
-{
-	struct hitpos *pos = &u->hitpos;
-
-	*cp &= ~0100;		/* mask sync bit */
-	pos->status = (*cp++ >> 2) | TBINPROX;
-	if (tc->tbc_flags&TBF_INPROX && pos->status&020)
-		pos->status &= ~(020|TBINPROX);
-	pos->xpos = *cp++;
-	pos->xpos |= *cp++ << 6;
-	pos->ypos = *cp++;
-	pos->ypos |= *cp++ << 6;
-	pos->scount++;
-}
-
-/*
- * Decode new Hitach 6-byte format (high res).
- */
-static void
-tbhresdecode(const struct tbconf *tc, char *cp, union tbpos *u)
-{
-	struct hitpos *pos = &u->hitpos;
-	char byte;
-
-	byte = *cp++;
-	pos->xpos = (byte & 03) << 14;
-	pos->xpos |= *cp++ << 7;
-	pos->xpos |= *cp++;
-	pos->ypos = *cp++ << 14;
-	pos->ypos |= *cp++ << 7;
-	pos->ypos |= *cp++;
-	pos->status = (byte >> 2) | TBINPROX;
-	if (tc->tbc_flags&TBF_INPROX && pos->status&020)
-		pos->status &= ~(020|TBINPROX);
-	pos->scount++;
-}
-
-/*
- * Polhemus decode.
- */
-static void
-poldecode(const struct tbconf *tc, char *cp, union tbpos *u)
-{
-	struct polpos *pos = &u->polpos;
-
-	pos->p_x = cp[4] | cp[3]<<7 | (cp[9] & 0x03) << 14;
-	pos->p_y = cp[6] | cp[5]<<7 | (cp[9] & 0x0c) << 12;
-	pos->p_z = cp[8] | cp[7]<<7 | (cp[9] & 0x30) << 10;
-	pos->p_azi = cp[11] | cp[10]<<7 | (cp[16] & 0x03) << 14;
-	pos->p_pit = cp[13] | cp[12]<<7 | (cp[16] & 0x0c) << 12;
-	pos->p_rol = cp[15] | cp[14]<<7 | (cp[16] & 0x30) << 10;
-	pos->p_stat = cp[1] | cp[0]<<7;
-	if (cp[2] != ' ')
-		pos->p_key = cp[2];
-}
-
-/*ARGSUSED*/
-int
-tbtioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct lwp *l)
-{
-	struct tb *tbp = (struct tb *)tp->t_sc;
-
-	switch (cmd) {
-
-	case BIOGMODE:
-		*(int *)data = tbp->tbflags & TBMODE;
-		break;
-
-	case BIOSTYPE:
-		if (tbconf[*(int *)data & TBTYPE].tbc_recsize == 0 ||
-		    tbconf[*(int *)data & TBTYPE].tbc_decode == 0)
-			return (EINVAL);
-		tbp->tbflags &= ~TBTYPE;
-		tbp->tbflags |= *(int *)data & TBTYPE;
-		/* fall thru... to set mode bits */
-
-	case BIOSMODE: {
-		const struct tbconf *tc;
-		const u_char *c;
-
-		tbp->tbflags &= ~TBMODE;
-		tbp->tbflags |= *(int *)data & TBMODE;
-		tc = &tbconf[tbp->tbflags & TBTYPE];
-		if (tbp->tbflags & TBSTOP) {
-			if (tc->tbc_stop)
-				for (c = tc->tbc_stop; *c != '\0'; c++)
-					ttyoutput(*c, tp);
-		} else if (tc->tbc_start)
-			for (c = tc->tbc_start; *c != '\0'; c++)
-				ttyoutput(*c, tp);
-		if (tbp->tbflags & TBPOINT) {
-			if (tc->tbc_point)
-				for (c = tc->tbc_point; *c != '\0'; c++)
-					ttyoutput(*c, tp);
-		} else if (tc->tbc_run)
-			for (c = tc->tbc_run; *c != '\0'; c++)
-				ttyoutput(*c, tp);
-		ttstart(tp);
-		break;
-	}
-
-	case BIOGTYPE:
-		*(int *)data = tbp->tbflags & TBTYPE;
-		break;
-
-	case TIOCSETD:
-	case TIOCGETD:
-	case TIOCSLINED:
-	case TIOCGLINED:
-	case TIOCGETA:
-	case TIOCGETP:
-	case TIOCGETC:
-		return (EPASSTHROUGH);	/* pass thru... */
-
-	default:
-		/* specifically disallow any other ioctl commands */
-		return (ENOTTY);
-	}
-	return (0);
-}
-
-void
-tbattach(int dummy)
-{
-
-	if (ttyldisc_attach(&tablet_disc) != 0)
-		panic("tbattach");
-}
diff --git a/sys/sys/Makefile b/sys/sys/Makefile
index e8dd181ed5c5..8ef7a44101c0 100644
--- a/sys/sys/Makefile
+++ b/sys/sys/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.78 2005/12/11 12:25:20 christos Exp $
+#	$NetBSD: Makefile,v 1.79 2005/12/20 05:35:30 thorpej Exp $
 
 INCSDIR= /usr/include/sys
 
@@ -26,7 +26,7 @@ INCS=	acct.h agpio.h ansi.h ataio.h audioio.h \
 	siginfo.h signal.h signalvar.h sigtypes.h socket.h \
 	socketvar.h sockio.h stat.h statvfs.h syscall.h syscallargs.h \
 	sysctl.h stdint.h swap.h syslimits.h syslog.h \
-	tablet.h tape.h termios.h time.h timeb.h timepps.h times.h \
+	tape.h termios.h time.h timeb.h timepps.h times.h \
 	timex.h trace.h tree.h tty.h ttychars.h ttycom.h \
 	ttydefaults.h ttydev.h types.h \
 	ucontext.h ucred.h uio.h un.h unistd.h unpcb.h user.h utsname.h uuid.h \
diff --git a/sys/sys/tablet.h b/sys/sys/tablet.h
deleted file mode 100644
index d98903269174..000000000000
--- a/sys/sys/tablet.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*	$NetBSD: tablet.h,v 1.13 2005/12/11 12:25:21 christos Exp $	*/
-
-/*-
- * Copyright (c) 1985, 1986, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)tablet.h	8.4 (Berkeley) 7/10/94
- */
-
-#ifndef _SYS_TABLET_H_
-#define	_SYS_TABLET_H_
-
-/*
- * Tablet line discipline.
- */
-#include <sys/ioctl.h>
-
-/*
- * Reads on the tablet return one of the following structures, depending on
- * the underlying tablet type.  The first two are defined such that a read of
- * sizeof (gtcopos) on a non-gtco tablet will return meaningful info.  The
- * in-proximity bit is simulated where the tablet does not directly provide
- * the information.
- */
-struct	hitpos {
-	int32_t	xpos, ypos;	/* raw x-y coordinates */
-	int16_t	status;		/* buttons/pen down */
-#define	TBINPROX	0100000		/* pen in proximity of tablet */
-	int16_t	scount;		/* sample count */
-};
-
-struct	gtcopos {
-	int32_t	xpos, ypos;	/* raw x-y coordinates */
-	int16_t	status;		/* as above */
-	int16_t	scount;		/* sample count */
-	int16_t	xtilt, ytilt;	/* raw tilt */
-	int16_t	pressure;
-	int16_t	pad;		/* pad to 32-bit boundary */
-};
-
-struct	polpos {
-	int16_t	p_x, p_y, p_z;	/* raw 3-space coordinates */
-	int16_t	p_azi, p_pit, p_rol;	/* azimuth, pitch, and roll */
-	int16_t	p_stat;		/* status, as above */
-	char	p_key;		/* calculator input keyboard */
-};
-
-#define BIOSMODE	_IOW('b', 1, int)	/* set mode bit(s) */
-#define BIOGMODE	_IOR('b', 2, int)	/* get mode bit(s) */
-#define	TBMODE		0xfff0		/* mode bits: */
-#define		TBPOINT		0x0010		/* single point */
-#define		TBRUN		0x0000		/* runs contin. */
-#define		TBSTOP		0x0020		/* shut-up */
-#define		TBGO		0x0000		/* ~TBSTOP */
-#define	TBTYPE		0x000f		/* tablet type: */
-#define		TBUNUSED	0x0
-#define		TBHITACHI	0x1		/* hitachi tablet */
-#define		TBTIGER		0x2		/* hitachi tiger */
-#define		TBGTCO		0x3		/* gtco */
-#define		TBPOL		0x4		/* polhemus 3space */
-#define		TBHDG		0x5		/* hdg-1111b, low res */
-#define		TBHDGHIRES	0x6		/* hdg-1111b, high res */
-#define		TBDIGI		0x7		/* gtco digi-pad, low res */
-#define		TBDIGIHIRES	0x8		/* gtco digi-pad, high res */
-#define BIOSTYPE	_IOW('b', 3, int)	/* set tablet type */
-#define BIOGTYPE	_IOR('b', 4, int)	/* get tablet type*/
-
-#endif /* !_SYS_TABLET_H_ */