diff options
| author | notaz | 2015-02-06 01:29:00 +0200 |
|---|---|---|
| committer | notaz | 2015-02-06 01:29:00 +0200 |
| commit | 2af7e74feec67c0a798ac190774cb4b3e925be76 (patch) | |
| tree | 27a148679e25f6edb7a2dd85c54514139bb72450 /include | |
| parent | cebb70f24ab54693b12aaa27b85a52689e26e1ff (diff) | |
| parent | 1e0eac2348343c8a046f7a75d460f087556cf7f6 (diff) | |
| download | pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.gz pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.tar.bz2 pcsx_rearmed-2af7e74feec67c0a798ac190774cb4b3e925be76.zip | |
Merge branch 'upstream' into libretro
Diffstat (limited to 'include')
| -rw-r--r-- | include/arm_features.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/arm_features.h b/include/arm_features.h index fdec522..bb48a2b 100644 --- a/include/arm_features.h +++ b/include/arm_features.h @@ -3,7 +3,7 @@ #if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ - || defined(__ARM_ARCH_7EM__) + || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_7S__) #define HAVE_ARMV7 #define HAVE_ARMV6 |