Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / compressed / head.S

diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 066b03480b63caacc04abf1ef0ec5ccf037fa52d..3a8b32df6b31e0eafc8f31ffa83eab07559f6d72 100644 (file)
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -60,11 +60,6 @@
                add     \rb, \rb, #0x00010000   @ Ser1
 #endif
                .endm
-#elif defined(CONFIG_ARCH_S3C24XX)
-               .macro loadsp, rb, tmp
-               mov     \rb, #0x50000000
-               add     \rb, \rb, #0x4000 * CONFIG_S3C_LOWLEVEL_UART_PORT
-               .endm
 #else
                .macro  loadsp, rb, tmp
                addruart \rb, \tmp