diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-15 22:02:11 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-15 22:02:11 -0800 |
| commit | 017c899c2db3da481cc174049e47307ed3aba530 (patch) | |
| tree | d2e55932579421d0196ac63c45bad1de8dbfa5eb /arch/arm/mach-ux500/include/mach/entry-macro.S | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | c97136307c2cd336a3ee68cc0890b0f55d01d2d4 (diff) | |
Merge branch 'omap/soc' into next/soc
Diffstat (limited to 'arch/arm/mach-ux500/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-ux500/include/mach/entry-macro.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/include/mach/entry-macro.S b/arch/arm/mach-ux500/include/mach/entry-macro.S index 071bba94f72..e16299e1020 100644 --- a/arch/arm/mach-ux500/include/mach/entry-macro.S +++ b/arch/arm/mach-ux500/include/mach/entry-macro.S @@ -10,8 +10,6 @@ * License version 2. This program is licensed "as is" without any * warranty of any kind, whether express or implied. */ -#include <mach/hardware.h> -#include <asm/hardware/entry-macro-gic.S> .macro disable_fiq .endm |