diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-06 16:53:54 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-01-06 16:53:54 +0400 |
| commit | 01deeef1e25035bbaca9bc580c88dc7cdbc85363 (patch) | |
| tree | 1994c9cede5c10eb07f53ecf76f2afcedd1e0c13 /arch/arm/mach-realview/include/mach/entry-macro.S | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
| parent | ef3a0bf5bfadbace156fa2a3b9c753df2de41df2 (diff) | |
Merge branch 'rmk-devel-stable' into linux-linaro-tracking
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mach-realview/include/mach/entry-macro.S')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/entry-macro.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/include/mach/entry-macro.S b/arch/arm/mach-realview/include/mach/entry-macro.S index 4071164aeba..e8a5179c265 100644 --- a/arch/arm/mach-realview/include/mach/entry-macro.S +++ b/arch/arm/mach-realview/include/mach/entry-macro.S @@ -7,8 +7,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 |