diff options
Diffstat (limited to 'src/mesa/x86/common_x86_asm.S')
| -rw-r--r-- | src/mesa/x86/common_x86_asm.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S index 09c86b05ba8..a681ff9b9eb 100644 --- a/src/mesa/x86/common_x86_asm.S +++ b/src/mesa/x86/common_x86_asm.S @@ -39,6 +39,10 @@ * in there will break the build on some platforms. */ +<<<<<<< HEAD:src/mesa/x86/common_x86_asm.S +======= +#include "matypes.h" +>>>>>>> master:src/mesa/x86/common_x86_asm.S #include "assyntax.h" #include "common_x86_features.h" |