diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/epson_sio/pf10.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/epson_sio/pf10.h')
-rw-r--r-- | src/devices/bus/epson_sio/pf10.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h index 7f305bed8c9..b75f596b615 100644 --- a/src/devices/bus/epson_sio/pf10.h +++ b/src/devices/bus/epson_sio/pf10.h @@ -15,7 +15,6 @@ #include "epson_sio.h" #include "cpu/m6800/m6801.h" -#include "imagedev/floppy.h" #include "machine/upd765.h" @@ -68,9 +67,9 @@ private: required_device<hd6303y_cpu_device> m_cpu; required_device<upd765a_device> m_fdc; required_device<epson_sio_device> m_sio_output; - required_device<floppy_connector> m_floppy; epson_sio_device *m_sio_input; + floppy_image_device *m_floppy; emu_timer *m_timer; |