diff options
author | Olof Johansson <olof@lixom.net> | 2013-08-04 12:41:57 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-08-04 12:42:54 -0700 |
commit | 3bd957978bb50390bb07678bc4c125989e9a81a2 (patch) | |
tree | 0fe14d779016e75b07a43bf48a7567ebda6507e9 /arch/arm/mach-shmobile/include/mach/zboot.h | |
parent | ad81f0545ef01ea651886dddac4bef6cec930092 (diff) | |
parent | 93d8a6fbe69a629a7bb37bb546699a5c49963dc5 (diff) | |
download | blackbird-obmc-linux-3bd957978bb50390bb07678bc4c125989e9a81a2.tar.gz blackbird-obmc-linux-3bd957978bb50390bb07678bc4c125989e9a81a2.zip |
Merge tag 'renesas-fixes-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/fixes-non-critical
From Simon Horman:
Renesas ARM based SoC fixes for v3.12
* Fix TPU clock name for r8a7740 SoC
* Update romImage to relocate appended DTB
* Thumb fixes
* tag 'renesas-fixes-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7740: Fix TPU clock name
ARM: shmobile: Insert align directives before 4 bytes data
ARM: shmobile: Force ARM mode to compile reset vector for secondary CPUs
ARM: shmobile: fix compile error when CONFIG_THUMB2_KERNEL=y
ARM: shmobile: Update romImage to relocate appended DTB
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/zboot.h')
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/zboot.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/include/mach/zboot.h b/arch/arm/mach-shmobile/include/mach/zboot.h index f2d8744c1f14..c3c4669a2d72 100644 --- a/arch/arm/mach-shmobile/include/mach/zboot.h +++ b/arch/arm/mach-shmobile/include/mach/zboot.h @@ -1,7 +1,6 @@ #ifndef ZBOOT_H #define ZBOOT_H -#include <asm/mach-types.h> #include <mach/zboot_macros.h> /************************************************** @@ -11,7 +10,6 @@ **************************************************/ #ifdef CONFIG_MACH_MACKEREL -#define MACH_TYPE MACH_TYPE_MACKEREL #define MEMORY_START 0x40000000 #include "mach/head-mackerel.txt" #else |