---

yaml --- r: 364294 b: refs/heads/master c: 89fa28d h: refs/heads/master v: v3
git-mirror · Apr 3, 2013 · 742b6ce · 742b6ce
1 parent 784aeb1
commit 742b6ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef99f3aee9641d10a7c80d4803d2f0f004c797ca
+refs/heads/master: 89fa28dbe0395ee06f3aacfe27655323ebad43d1
diff --git a/trunk/drivers/tty/serial/amba-pl011.c b/trunk/drivers/tty/serial/amba-pl011.c
@@ -1195,6 +1195,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
 			uap->im |= UART011_RXIM;
 		} else {
 			uap->im &= ~UART011_RXIM;
+#ifdef CONFIG_DMA_ENGINE
 			/* Start Rx DMA poll */
 			if (uap->dmarx.poll_rate) {
 				uap->dmarx.last_jiffies = jiffies;
@@ -1203,6 +1204,7 @@ static void pl011_rx_chars(struct uart_amba_port *uap)
 					jiffies +
 					msecs_to_jiffies(uap->dmarx.poll_rate));
 			}
+#endif
 		}
 
 		writew(uap->im, uap->port.membase + UART011_IMSC);
@@ -1665,11 +1667,13 @@ pl011_set_termios(struct uart_port *port, struct ktermios *termios,
 	 */
 	baud = uart_get_baud_rate(port, termios, old, 0,
 				  port->uartclk / clkdiv);
+#ifdef CONFIG_DMA_ENGINE
 	/*
 	 * Adjust RX DMA polling rate with baud rate if not specified.
 	 */
 	if (uap->dmarx.auto_poll_rate)
 		uap->dmarx.poll_rate = DIV_ROUND_UP(10000000, baud);
+#endif
 
 	if (baud > port->uartclk/16)
 		quot = DIV_ROUND_CLOSEST(port->uartclk * 8, baud);