]> Pileus Git - ~andy/linux/commitdiff
serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
authorArnd Bergmann <arnd@arndb.de>
Sat, 20 Apr 2013 07:40:33 +0000 (09:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 20 Apr 2013 07:40:33 +0000 (09:40 +0200)
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>
drivers/tty/serial/amba-pl011.c

index c25b00ef9dbbcc6b174de6765d7d148bcf707a89..1c1942b5cee9b5d88f2b139de4a56c261048f1c7 100644 (file)
@@ -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)
 {
 }