summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-zynq/include/mach/entry-macro.S
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-15 22:02:11 -0800
committerOlof Johansson <olof@lixom.net>2011-12-15 22:02:11 -0800
commit017c899c2db3da481cc174049e47307ed3aba530 (patch)
treed2e55932579421d0196ac63c45bad1de8dbfa5eb /arch/arm/mach-zynq/include/mach/entry-macro.S
parentdc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff)
parentc97136307c2cd336a3ee68cc0890b0f55d01d2d4 (diff)
Merge branch 'omap/soc' into next/soc
Diffstat (limited to 'arch/arm/mach-zynq/include/mach/entry-macro.S')
-rw-r--r--arch/arm/mach-zynq/include/mach/entry-macro.S3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-zynq/include/mach/entry-macro.S b/arch/arm/mach-zynq/include/mach/entry-macro.S
index 3cfc01b3746..d621fb73256 100644
--- a/arch/arm/mach-zynq/include/mach/entry-macro.S
+++ b/arch/arm/mach-zynq/include/mach/entry-macro.S
@@ -20,9 +20,6 @@
* GNU General Public License for more details.
*/
-#include <mach/hardware.h>
-#include <asm/hardware/entry-macro-gic.S>
-
.macro disable_fiq
.endm