---

yaml --- r: 374178 b: refs/heads/master c: aabdd29 h: refs/heads/master v: v3
git-mirror · Apr 20, 2013 · 5057334 · 5057334
1 parent 72cc0c7
commit 5057334
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f54ae513d3d39b60bcc2ef446f1219f501d859bf
+refs/heads/master: aabdd2901ad0bfaeaf108eb29183cbb270dba3bf
diff --git a/trunk/drivers/tty/serial/amba-pl011.c b/trunk/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)
 {
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     #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)
     {
     }
@@ Expand Down @@