diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-20 09:40:33 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-20 09:40:33 +0200 |
| commit | aabdd2901ad0bfaeaf108eb29183cbb270dba3bf (patch) | |
| tree | 795215dc9982da966809d37e1f9a73d5cb7887ed /drivers/tty | |
| parent | Merge branch 'spear/dwdma' into late/cleanup (diff) | |
| download | linux-aabdd2901ad0bfaeaf108eb29183cbb270dba3bf.tar.xz linux-aabdd2901ad0bfaeaf108eb29183cbb270dba3bf.zip | |
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/amba-pl011.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { } |