diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 14:50:01 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 14:50:01 -0800 |
| commit | b94ee062b5b41c7fc0e44309e8546d4694e75007 (patch) | |
| tree | 2ba08003be8d25a573c17a00a627b424de4bb2e4 /arch/arm/mach-zynq/include/mach/entry-macro.S | |
| parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
| parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
| download | op-kernel-dev-b94ee062b5b41c7fc0e44309e8546d4694e75007.zip op-kernel-dev-b94ee062b5b41c7fc0e44309e8546d4694e75007.tar.gz | |
Merge branch 'depends/rmk/devel-stable' into next/boards
Diffstat (limited to 'arch/arm/mach-zynq/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-zynq/include/mach/entry-macro.S | 3 |
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 3cfc01b..d621fb7 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 |
