From: Heiko Stuebner Date: Thu, 15 May 2014 21:59:18 +0000 (+0900) Subject: ARM: S3C24XX: move debug-macro.S into the common space X-Git-Tag: v3.16-rc1~30^2~45^2~1^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cd62bd4e5226ae5fa61f58ade8148f2e4643335;p=thirdparty%2Fkernel%2Flinux.git ARM: S3C24XX: move debug-macro.S into the common space Move debug-macro.S from mach/include to include/debug where all other common debug macros are. Signed-off-by: Heiko Stuebner Signed-off-by: Kukjin Kim --- diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 104c8fb818ed0..4678870f8ee8d 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1010,6 +1010,7 @@ config DEBUG_LL_INCLUDE DEBUG_IMX6SL_UART default "debug/msm.S" if DEBUG_MSM_UART default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART + default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 default "debug/sti.S" if DEBUG_STI_UART default "debug/tegra.S" if DEBUG_TEGRA_UART diff --git a/arch/arm/mach-s3c24xx/include/mach/debug-macro.S b/arch/arm/include/debug/s3c24xx.S similarity index 100% rename from arch/arm/mach-s3c24xx/include/mach/debug-macro.S rename to arch/arm/include/debug/s3c24xx.S