summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorMat M <mathew1800@gmail.com>2016-05-26 20:19:31 +0200
committerMat M <mathew1800@gmail.com>2016-05-26 20:19:31 +0200
commitade08895192f00061a30e724101458aa80d04dc3 (patch)
tree0af032b925959ffda0f13111f97dbf5c5dcc4e44 /src/core
parentMerge pull request #1817 from linkmauve/smdh-stuff (diff)
parentMemory: Added necessary headers and removed unnecessary header (diff)
downloadyuzu-ade08895192f00061a30e724101458aa80d04dc3.tar
yuzu-ade08895192f00061a30e724101458aa80d04dc3.tar.gz
yuzu-ade08895192f00061a30e724101458aa80d04dc3.tar.bz2
yuzu-ade08895192f00061a30e724101458aa80d04dc3.tar.lz
yuzu-ade08895192f00061a30e724101458aa80d04dc3.tar.xz
yuzu-ade08895192f00061a30e724101458aa80d04dc3.tar.zst
yuzu-ade08895192f00061a30e724101458aa80d04dc3.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/kernel/vm_manager.cpp1
-rw-r--r--src/core/memory_setup.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/vm_manager.cpp b/src/core/hle/kernel/vm_manager.cpp
index 1e289f38a..066146cff 100644
--- 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"
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h
index 05f70a1fe..ee8ea7857 100644
--- 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 {