Merge pull request #1855 from MerryMage/memory-headers-20160526

Memory: Added necessary headers and removed unnecessary header
11 years ago · 3a55dfa4b2
2 changed files with 2 additions and 1 deletions
--- a/src/core/hle/kernel/vm_manager.cpp
+++ b/src/core/hle/kernel/vm_manager.cpp
@ -7,6 +7,7 @@
 #include "common/assert.h"

 #include "core/hle/kernel/vm_manager.h"
+#include "core/memory.h"
 #include "core/memory_setup.h"
 #include "core/mmio.h"

--- a/src/core/memory_setup.h
+++ b/src/core/memory_setup.h
@ -6,7 +6,7 @@

 #include "common/common_types.h"

-#include "core/memory.h"
+#include "core/mmio.h"

 namespace Memory {