diff options
| author | Mat M <mathew1800@gmail.com> | 2016-05-26 14:19:31 -0400 |
|---|---|---|
| committer | Mat M <mathew1800@gmail.com> | 2016-05-26 14:19:31 -0400 |
| commit | ade08895192f00061a30e724101458aa80d04dc3 (patch) | |
| tree | 0af032b925959ffda0f13111f97dbf5c5dcc4e44 | |
| parent | f50a32bfce099eeff510e5e314b91dcf65d317ac (diff) | |
| parent | 80abe6eb08c9b409de2da718ffcca16fb3d95173 (diff) | |
Merge pull request #1855 from MerryMage/memory-headers-20160526
Memory: Added necessary headers and removed unnecessary header
| -rw-r--r-- | src/core/hle/kernel/vm_manager.cpp | 1 | ||||
| -rw-r--r-- | src/core/memory_setup.h | 2 |
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 { |