OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f54ae51
)
serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
author
Arnd Bergmann
<arnd@arndb.de>
Sat, 20 Apr 2013 07:40:33 +0000
(09:40 +0200)
committer
Arnd 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
patch
|
blob
|
history
diff --git
a/drivers/tty/serial/amba-pl011.c
b/drivers/tty/serial/amba-pl011.c
index
c25b00e
..
1c1942b
100644
(file)
--- 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)
{
}