Revert "Merge branch 'feature/machine_and_kb' into master"

This reverts commit 6604a29d7e, reversing changes made to 1d7fca0abd.
2021-07-04 18:22:52 +03:00
parent 6604a29d7e
commit f2cd3756dd
77 changed files with 3483 additions and 11882 deletions
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -111,8 +111,6 @@ video_cards[] = {
    { "tvga9000b",		&tvga9000b_device			},
    { "tgkorvga",		&et4000k_isa_device			},
    { "et2000",			&et2000_device				},
-    { "et3000ax",		&et3000_isa_device			},
-    { "et4000ax_tc6058af",	&et4000_tc6058af_isa_device		},
    { "et4000ax",		&et4000_isa_device			},
    { "et4000w32",		&et4000w32_device			},
    { "et4000w32i",		&et4000w32i_isa_device			},