Merge branch 'master' of https://github.com/86Box/86Box

2020-04-16 21:56:33 +02:00
parent 275dd5a2f7 8b230b7371
commit 3452688a89
6 changed files with 61 additions and 35 deletions
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -312,6 +312,7 @@ extern const device_t	*at_pb640_get_device(void);
 /* m_at_socket8.c */
 extern int	machine_at_i440fx_init(const machine_t *);
 extern int	machine_at_s1668_init(const machine_t *);
+extern int	machine_at_m6mi_init(const machine_t *);

 /* m_at_slot1.c */
 extern int	machine_at_6bxc_init(const machine_t *);