From 5dd3b95ad4a34eb3cc1237436d57a729891f0f81 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 20 Jul 2010 15:26:10 -0700 Subject: [PATCH] --- yaml --- r: 207924 b: refs/heads/master c: e8dd4757a6cf0a8909148a61b89fa3a6d4f9b3ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/altera_uart.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6868a16bf604..b10a9e89f4be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 078dee2d298d003f19203b120b7438beea681e60 +refs/heads/master: e8dd4757a6cf0a8909148a61b89fa3a6d4f9b3ee diff --git a/trunk/drivers/serial/altera_uart.c b/trunk/drivers/serial/altera_uart.c index 0f1189605d21..f8d8a00554da 100644 --- a/trunk/drivers/serial/altera_uart.c +++ b/trunk/drivers/serial/altera_uart.c @@ -394,7 +394,7 @@ int __init early_altera_uart_setup(struct altera_uart_platform_uart *platp) static void altera_uart_console_putc(struct uart_port *port, const char c) { while (!(readl(port->membase + ALTERA_UART_STATUS_REG) & - ALTERA_UART_STATUS_TRDY_MSK)) + ALTERA_UART_STATUS_TRDY_MSK)) cpu_relax(); writel(c, port->membase + ALTERA_UART_TXDATA_REG);