diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-09-04 21:44:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-04 21:44:54 +0200 |
| commit | 647f95fa99b16e7c7854a202e91e6aa22ebeecf4 (patch) | |
| tree | 8bcb7577418246e48ab83d09b950fe4041bcc4d9 /arch/arm/mach-msm/io.c | |
| parent | fff74a935ec81d2353423917a2638aa1570d4634 (diff) | |
| parent | 77cfe68e2808be01497124c1fa889322b483650c (diff) | |
Merge tag 'msm-cleanup-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
Merge "MSM cleanups" from Linus Walleij:
This cleans out some cruft code in the MSM architecture.
* tag 'msm-cleanup-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: msm: Update the references to DEBUG_MSM_UARTx
ARM: msm: remove reference to MSM_SERIAL_DEBUGGER
ARM: msm: delete dangling mahimahi board file
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-msm/io.c')
| -rw-r--r-- | arch/arm/mach-msm/io.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index 34e09474636..b042dca1f63 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c @@ -57,8 +57,7 @@ static struct map_desc msm_io_desc[] __initdata = { .length = MSM_SHARED_RAM_SIZE, .type = MT_DEVICE, }, -#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ - defined(CONFIG_DEBUG_MSM_UART3) +#if defined(CONFIG_DEBUG_MSM_UART) { /* Must be last: virtual and pfn filled in by debug_ll_addr() */ .length = SZ_4K, @@ -76,8 +75,7 @@ void __init msm_map_common_io(void) * pages are peripheral interface or not. */ asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0)); -#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \ - defined(CONFIG_DEBUG_MSM_UART3) +#if defined(CONFIG_DEBUG_MSM_UART) #ifdef CONFIG_MMU debug_ll_addr(&msm_io_desc[size - 1].pfn, &msm_io_desc[size - 1].virtual); |