diff options
| author | 2016-09-21 11:29:48 -0700 | |
|---|---|---|
| committer | 2016-09-21 11:29:48 -0700 | |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/core/memory_setup.h | |
| parent | README: Specify master branch for Travis CI badge (diff) | |
| parent | Fix Travis clang-format check (diff) | |
| download | yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/core/memory_setup.h')
| -rw-r--r-- | src/core/memory_setup.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h index ee8ea7857..3fdf3a87d 100644 --- a/src/core/memory_setup.h +++ b/src/core/memory_setup.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | |||
| 9 | #include "core/mmio.h" | 8 | #include "core/mmio.h" |
| 10 | 9 | ||
| 11 | namespace Memory { | 10 | namespace Memory { |
| @@ -30,5 +29,4 @@ void MapMemoryRegion(VAddr base, u32 size, u8* target); | |||
| 30 | void MapIoRegion(VAddr base, u32 size, MMIORegionPointer mmio_handler); | 29 | void MapIoRegion(VAddr base, u32 size, MMIORegionPointer mmio_handler); |
| 31 | 30 | ||
| 32 | void UnmapRegion(VAddr base, u32 size); | 31 | void UnmapRegion(VAddr base, u32 size); |
| 33 | |||
| 34 | } | 32 | } |