From 505733493f15cbb54d10cff0f41f8d142ed9a961 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 20 Apr 2013 09:40:33 +0200
Subject: [PATCH] --- yaml --- r: 374178 b: refs/heads/master c:
 aabdd2901ad0bfaeaf108eb29183cbb270dba3bf h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/tty/serial/amba-pl011.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d6020e5b7f14..0285c2d21bcc 100644
--- 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
index c25b00ef9dbb..1c1942b5cee9 100644
--- 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)
 {
 }