amba-pl011: fix build error if CONFIG_DMA_ENGINE is not enabled
authorChanho Min <chanho.min@lge.com>
Wed, 3 Apr 2013 02:10:37 +0000 (11:10 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2013 18:34:55 +0000 (11:34 -0700)
Following patch will fix build error if CONFIG_DMA_ENGINE is unset.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Chanho Min <chanho.min@lge.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/amba-pl011.c

index b031abf43a7abf1ec3c6ee7cf2ab9e827b622a82..6cf861efb2afaf3ef5639cb2077ff40092f7529d 100644 (file)
@@ -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);