diff --git a/[refs] b/[refs] index 2815273b17a8..8e91cd4f6e39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d9147053bb7b90f083220440194a1cff0ee90b6 +refs/heads/master: 68c1dbcb5aeb00eb17caf0c2e42c71b48baac902 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 92951103255a..a7ed21f0136a 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -1622,7 +1622,8 @@ config ZRELADDR default 0x40008000 if ARCH_STMP378X ||\ ARCH_STMP37XX ||\ ARCH_SH7372 ||\ - ARCH_SH7377 + ARCH_SH7377 ||\ + ARCH_S5PV310 default 0x50008000 if ARCH_S3C64XX ||\ ARCH_SH7367 default 0x60008000 if ARCH_VEXPRESS