aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm/board-trout-gpio.c
diff options
context:
space:
mode:
authorGeorgi Djakov <gdjakov@mm-sol.com>2014-05-26 19:37:40 +0300
committerLinus Walleij <linus.walleij@linaro.org>2014-08-24 20:09:36 +0200
commit77cfe68e2808be01497124c1fa889322b483650c (patch)
tree0ec1b69c48127cd8d9b9ed83fbb7487f1423dc4e /arch/arm/mach-msm/board-trout-gpio.c
parentARM: msm: remove reference to MSM_SERIAL_DEBUGGER (diff)
downloadlinux-dev-77cfe68e2808be01497124c1fa889322b483650c.tar.xz
linux-dev-77cfe68e2808be01497124c1fa889322b483650c.zip
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-gpio.c')
-rw-r--r--arch/arm/mach-msm/board-trout-gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
index 2c25050209ce..722ad63b7edc 100644
--- a/arch/arm/mach-msm/board-trout-gpio.c
+++ b/arch/arm/mach-msm/board-trout-gpio.c
@@ -94,7 +94,7 @@ static int trout_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
}
static struct msm_gpio_chip msm_gpio_banks[] = {
-#if defined(CONFIG_MSM_DEBUG_UART1)
+#if defined(CONFIG_DEBUG_MSM_UART) && (CONFIG_DEBUG_UART_PHYS == 0xa9a00000)
/* H2W pins <-> UART1 */
TROUT_GPIO_BANK("MISC2", 0x00, TROUT_GPIO_MISC2_BASE, 0x40),
#else