The Compaq Portable III and III/386 now have the Olivetti M24 display adapter (though pending implementation of Compaq-specific registers);

Bugfixes in config.c regarding CD-ROM defaults and IDE channel reading;
Applied all the PCem Voodoo commits;
The Sound Blaster cards' OPL can now be disabled for slight performance gain.

src/nvr_ps2.c

@@ -80,7 +80,7 @@ static void *ps2_nvr_init(device_t *info)
         return nvr;
 }
 
-static void ps2_nvr_close(void *p)
+void ps2_nvr_close(void *p)
 {
         ps2_nvr_t *nvr = (ps2_nvr_t *)p;
         FILE *f = NULL;