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/board-trout.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/board-trout.c')
| -rw-r--r-- | arch/arm/mach-msm/board-trout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c index f72b07de215..ba3edd3a46c 100644 --- a/arch/arm/mach-msm/board-trout.c +++ b/arch/arm/mach-msm/board-trout.c @@ -88,7 +88,7 @@ static void __init trout_map_io(void) msm_map_common_io(); iotable_init(trout_io_desc, ARRAY_SIZE(trout_io_desc)); -#ifdef CONFIG_MSM_DEBUG_UART3 +#if defined(CONFIG_DEBUG_MSM_UART) && (CONFIG_DEBUG_UART_PHYS == 0xa9c00000) /* route UART3 to the "H2W" extended usb connector */ writeb(0x80, TROUT_CPLD_BASE + 0x00); #endif |