diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2016-05-26 19:53:30 +0200 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2016-05-26 19:55:37 +0200 |
| commit | 80abe6eb08c9b409de2da718ffcca16fb3d95173 (patch) | |
| tree | e662db7d394aaedfacf11a2123d4eb2d66b05a83 /src | |
| parent | Merge pull request #1564 from MerryMage/this-is-only-a-test (diff) | |
| download | yuzu-80abe6eb08c9b409de2da718ffcca16fb3d95173.tar yuzu-80abe6eb08c9b409de2da718ffcca16fb3d95173.tar.gz yuzu-80abe6eb08c9b409de2da718ffcca16fb3d95173.tar.bz2 yuzu-80abe6eb08c9b409de2da718ffcca16fb3d95173.tar.lz yuzu-80abe6eb08c9b409de2da718ffcca16fb3d95173.tar.xz yuzu-80abe6eb08c9b409de2da718ffcca16fb3d95173.tar.zst yuzu-80abe6eb08c9b409de2da718ffcca16fb3d95173.zip | |
Diffstat (limited to 'src')
| -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 { |