Merge ^/head r312894 through r312967.

5 files changed, 2 insertions, 17 deletions

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 63fe98cb7b3b..27c07983a577 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -7601,8 +7601,6 @@ OLD_FILES+=usr/share/syscons/keymaps/it.iso.kbd
 OLD_FILES+=usr/share/syscons/keymaps/iw.iso8.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.106.kbd
 OLD_FILES+=usr/share/syscons/keymaps/jp.106x.kbd
-OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.iso.kbd
-OLD_FILES+=usr/share/syscons/keymaps/jp.pc98.kbd
 OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.io.kbd
 OLD_FILES+=usr/share/syscons/keymaps/kk.pt154.kst.kbd
 OLD_FILES+=usr/share/syscons/keymaps/latinamerican.iso.acc.kbd
diff --git a/tools/tools/kerninclude/kerninclude.sh b/tools/tools/kerninclude/kerninclude.sh
index 1efe4c278fc2..fd3e4fd4e072 100644
--- a/tools/tools/kerninclude/kerninclude.sh
+++ b/tools/tools/kerninclude/kerninclude.sh
@@ -21,7 +21,7 @@ cd /sys
 init=false
 
 # Which kernels you want to check
-kernels="LINT GENERIC GENERIC98"
+kernels="LINT GENERIC"
 
 NO_MODULES=yes
 export NO_MODULES
@@ -61,14 +61,6 @@ echo "Configuring kernels"
 	config LINT
 	config GENERIC
 )
-(
-	cd pc98/conf
-	cp -f GENERIC GENERIC98
-	if $init ; then
-		rm -rf ../../compile/GENERIC98
-	fi
-	config GENERIC98
-)
 
 for i in $kernels
 do
diff --git a/tools/tools/sysdoc/sysdoc.sh b/tools/tools/sysdoc/sysdoc.sh
index 872eabd212c6..66d26632f8e7 100644
--- a/tools/tools/sysdoc/sysdoc.sh
+++ b/tools/tools/sysdoc/sysdoc.sh
@@ -210,7 +210,7 @@ EOF
 
 #
 # The nm(1) utility must only be used on the architecture which
-# we build it for.  Although i386 and pc98 are so; my only fear
+# we build it for.  Although i386 is so; my only fear
 # with this is that this will not work properly on cross-builds.
 
 while getopts k FLAG;
diff --git a/tools/tools/vt/keymaps/KBDFILES.map b/tools/tools/vt/keymaps/KBDFILES.map
index 24b90a7736bf..7964570b9a85 100644
--- a/tools/tools/vt/keymaps/KBDFILES.map
+++ b/tools/tools/vt/keymaps/KBDFILES.map
@@ -78,8 +78,6 @@ ISO8859-1+EURO	it.iso.kbd			it.kbd
 
 ISO8859-1+YEN	jp.106.kbd			jp.kbd
 ISO8859-1+YEN	jp.106x.kbd			jp.capsctrl.kbd
-ISO8859-1+YEN	jp.pc98.kbd			jp.pc98.kbd
-ISO8859-1+YEN	jp.pc98.iso.kbd			jp.pc98.iso.kbd
 
 PT154		kk.pt154.kst.kbd		kz.kst.kbd
 PT154		kk.pt154.io.kbd			kz.io.kbd
diff --git a/tools/tools/vt/keymaps/convert-keymap.pl b/tools/tools/vt/keymaps/convert-keymap.pl
index 313c653ba289..4783fe66bca7 100755
--- a/tools/tools/vt/keymaps/convert-keymap.pl
+++ b/tools/tools/vt/keymaps/convert-keymap.pl
@@ -60,9 +60,6 @@ sub local_to_UCS_code
     $ucs_char = 0xa5	# replace with Jap. Yen character on PC kbd
 	if $ucs_char == ord('\\') and $use_yen and $current_scancode == 125;
 
-#    $ucs_char = 0xa5	# replace with Jap. Yen character on PC98x1 kbd
-#	if $ucs_char == ord('\\') and $use_yen and $current_scancode == 13;
-
     return prettyprint_token($ucs_char);
 }