From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 20 Apr 2013 07:40:33 +0000 (+0200)
Subject: serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aabdd2901ad0bfaeaf108eb29183cbb270dba3bf;p=linux-beck.git

serial: amba-pl011: fix !CONFIG_DMA_ENGINE case

I changed the prototype of the function earlier but only
in the section for CONFIG_DMA_ENGINE, not the alternative.
This makes the driver build again, e.g. for vexpress_defconfig.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index c25b00ef9dbb..1c1942b5cee9 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -991,7 +991,7 @@ static inline bool pl011_dma_rx_running(struct uart_amba_port *uap)
 
 #else
 /* Blank functions if the DMA engine is not available */
-static inline void pl011_dma_probe(struct uart_amba_port *uap)
+static inline void pl011_dma_probe(struct device *dev, struct uart_amba_port *uap)
 {
 }