diff options
| author | Georgi Djakov <gdjakov@mm-sol.com> | 2014-05-26 19:37:40 +0300 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-08-24 20:09:36 +0200 |
| commit | 77cfe68e2808be01497124c1fa889322b483650c (patch) | |
| tree | 0ec1b69c48127cd8d9b9ed83fbb7487f1423dc4e /arch/arm/mach-msm/board-trout.c | |
| parent | 262334ae213b7e84da1d0f1c53c5ecb580fc19d0 (diff) | |
| download | op-kernel-dev-77cfe68e2808be01497124c1fa889322b483650c.zip op-kernel-dev-77cfe68e2808be01497124c1fa889322b483650c.tar.gz | |
ARM: msm: Update the references to DEBUG_MSM_UARTx
The Kconfig options DEBUG_MSM_UART1, DEBUG_MSM_UART2, DEBUG_MSM_UART3,
MSM_DEBUG_UART1, MSM_DEBUG_UART2 and MSM_DEBUG_UART3 are removed, but
they are still referenced in the following files:
arch/arm/mach-msm/io.c,
arch/arm/mach-msm/board-trout.c
arch/arm/mach-msm/board-trout-gpio.c
Fix this by updating the reference to the new Kconfig option.
Reported-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Georgi Djakov <gdjakov@mm-sol.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
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 f72b07de..ba3edd3 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 |
