diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:34:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-01 23:34:22 -0400 |
commit | 6585dea1f99cc2265582ff2e4cc1727062136e92 (patch) | |
tree | 57378ccfe0f9fde73081e1f9355d05dd4131e178 /arch/arm/mach-mxs/include | |
parent | 16ee792e45cf0c97ce061fce03c36cab5551ec72 (diff) | |
parent | 97c24c1aa403e0d4ef7c1958db8459e488862b46 (diff) |
Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc
* 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
arm/imx: use Kconfig choice for low-level debug UART selection
ARM: realview: use Kconfig choice for debug UART selection
ARM: plat-samsung: use Kconfig choice for debug UART selection
ARM: versatile: convert logical CPU numbers to physical numbers
ARM: ux500: convert logical CPU numbers to physical numbers
ARM: shmobile: convert logical CPU numbers to physical numbers
ARM: msm: convert logical CPU numbers to physical numbers
ARM: exynos4: convert logical CPU numbers to physical numbers
Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug
Diffstat (limited to 'arch/arm/mach-mxs/include')
-rw-r--r-- | arch/arm/mach-mxs/include/mach/debug-macro.S | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/arch/arm/mach-mxs/include/mach/debug-macro.S b/arch/arm/mach-mxs/include/mach/debug-macro.S index 714570d83668..90c6b7836ad3 100644 --- a/arch/arm/mach-mxs/include/mach/debug-macro.S +++ b/arch/arm/mach-mxs/include/mach/debug-macro.S | |||
@@ -14,17 +14,9 @@ | |||
14 | #include <mach/mx23.h> | 14 | #include <mach/mx23.h> |
15 | #include <mach/mx28.h> | 15 | #include <mach/mx28.h> |
16 | 16 | ||
17 | #ifdef CONFIG_SOC_IMX23 | 17 | #ifdef CONFIG_DEBUG_IMX23_UART |
18 | #ifdef UART_PADDR | ||
19 | #error "CONFIG_DEBUG_LL is incompatible with multiple archs" | ||
20 | #endif | ||
21 | #define UART_PADDR MX23_DUART_BASE_ADDR | 18 | #define UART_PADDR MX23_DUART_BASE_ADDR |
22 | #endif | 19 | #elif defined (CONFIG_DEBUG_IMX28_UART) |
23 | |||
24 | #ifdef CONFIG_SOC_IMX28 | ||
25 | #ifdef UART_PADDR | ||
26 | #error "CONFIG_DEBUG_LL is incompatible with multiple archs" | ||
27 | #endif | ||
28 | #define UART_PADDR MX28_DUART_BASE_ADDR | 20 | #define UART_PADDR MX28_DUART_BASE_ADDR |
29 | #endif | 21 | #endif |
30 | 22 | ||