From 7e9a06020237f7bdbad96dc304a376b67926f08f Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Tue, 19 Mar 2019 11:19:09 -0600
Subject: [PATCH] arch/arm/src/armv7-a:  Fix assemble error when including
 gic.h

---
 arch/arm/src/armv7-a/gic.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/src/armv7-a/gic.h b/arch/arm/src/armv7-a/gic.h
index c60c64a01d9..ec142f32ca8 100644
--- a/arch/arm/src/armv7-a/gic.h
+++ b/arch/arm/src/armv7-a/gic.h
@@ -2,7 +2,7 @@
  * arch/arm/src/armv7-a/gic.h
  * Generic Interrupt Controller Version 2 Definitions
  *
- *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2016, 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Reference:
@@ -50,8 +50,10 @@
 
 #include "nuttx/config.h"
 
-#include <sys/types.h>
-#include <stdint.h>
+#ifndef __ASSEMBLY__
+#  include <sys/types.h>
+#  include <stdint.h>
+#endif
 
 #include "mpcore.h"
 #include "up_arch.h"