From patchwork Sat Aug 6 08:40:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 1041152 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p768f4oK001735 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 6 Aug 2011 08:41:24 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QpcRB-00008D-5e; Sat, 06 Aug 2011 08:40:53 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QpcRA-00074m-Kp; Sat, 06 Aug 2011 08:40:52 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QpcR6-00074C-OA for linux-arm-kernel@lists.infradead.org; Sat, 06 Aug 2011 08:40:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Cc:To:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Cc:From; bh=bJQnGqS38OsQJ1OHQ8G9sUinuYOWkpEFOYkL5dkVsMg=; b=LC6P1PYV29TKYE2w3nYy6GXh0owk3E/ehkYKIIZSYybqcunMybd8XnbZgZiwW6ZPNdGDw4rHeKGSwxLWtAohVK5rX0Y7Z0iXltPNyQh2cGdHPoRXNWfQD3k8xTcFNeqa7h5msIAz6bImwN6T8HwiBr0wq8FnmjmoWCD1iK9K3OA=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd] helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1QpcR2-0006xA-TW; Sat, 06 Aug 2011 09:40:45 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1QpcR1-00013t-Sj; Sat, 06 Aug 2011 09:40:44 +0100 From: Russell King - ARM Linux Subject: [PATCH] dmaengine: PL08x: Fix trivial build error MIME-Version: 1.0 Content-Disposition: inline To: Vinod Koul Message-Id: Date: Sat, 06 Aug 2011 09:40:43 +0100 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110806_044049_360972_9506FD2E X-CRM114-Status: GOOD ( 12.38 ) X-Spam-Score: 1.2 (+) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS Cc: linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Sat, 06 Aug 2011 08:41:24 +0000 (UTC) X-MIME-Autoconverted: from base64 to 8bit by demeter2.kernel.org id p768f4oK001735 Something changed during the 3.1 merge window in the include files which now causes the pl08x DMA engine driver to fail to build. Fix this by adding the now necessary dma-mapping.h include: drivers/dma/amba-pl08x.c: In function ?pl08x_unmap_buffers?: drivers/dma/amba-pl08x.c:1524: error: implicit declaration of function ?dma_unmap_single? drivers/dma/amba-pl08x.c:1527: error: implicit declaration of function ?dma_unmap_page? Signed-off-by: Russell King Acked-by: Vinod Koul Acked-by: Linus Walleij --- If you can provide an ack, and I'll push this through my pending 'fixes' merge. drivers/dma/amba-pl08x.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 196a737..be21e3f 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -80,6 +80,7 @@ #include #include #include +#include #include #include #include