[General][CMake] Merge upstream 2016-02-26.

[csp-qt/common_source_project-fm7.git] / source / src / vm / jr100 / memory.cpp

diff --git a/source/src/vm/jr100/memory.cpp b/source/src/vm/jr100/memory.cpp
index 72e46e9..42129f4 100644 (file)
--- a/source/src/vm/jr100/memory.cpp
+++ b/source/src/vm/jr100/memory.cpp
@@ -8,7 +8,7 @@
 */
 
 #include "memory.h"
-#include "../sy6552.h"
+#include "../sy6522.h"
 
 #define SET_BANK(s, e, w, r) { \
        int sb = (s) >> 13, eb = (e) >> 13; \
@@ -136,7 +136,7 @@ void MEMORY::event_frame()
                if(key_stat[key_table[key_column][3]]) data |= 0x08;
                if(key_stat[key_table[key_column][4]]) data |= 0x10;
        }
-       d_via->write_signal(SIG_SY6552_PORT_B, ~data, 0x1f);
+       d_via->write_signal(SIG_SY6522_PORT_B, ~data, 0x1f);
 }
 
 void MEMORY::draw_screen()