From patchwork Tue Aug 28 18:59:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 1382291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id EF7173FC85 for ; Tue, 28 Aug 2012 19:03:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T6R1V-0008Le-NR; Tue, 28 Aug 2012 19:00:25 +0000 Received: from mail.free-electrons.com ([88.190.12.23]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T6R0p-0008Cv-5s for linux-arm-kernel@lists.infradead.org; Tue, 28 Aug 2012 18:59:44 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id C16252F2; Tue, 28 Aug 2012 20:59:40 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, KHOP_BIG_TO_CC shortcircuit=no autolearn=ham version=3.3.1 Received: from localhost (unknown [38.96.16.75]) by mail.free-electrons.com (Postfix) with ESMTPSA id 104461A6; Tue, 28 Aug 2012 20:59:33 +0200 (CEST) From: Thomas Petazzoni To: Jason Cooper , Andrew Lunn , Gregory Clement Subject: [PATCH 5/8] dma: mv_xor: move to Date: Tue, 28 Aug 2012 20:59:06 +0200 Message-Id: <1346180349-25123-6-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346180349-25123-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1346180349-25123-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.1 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -0.0 SPF_PASS SPF: sender matches SPF record -0.2 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lior Amsalem , Ike Pan , Albert Stone , Nadav Haklai , Ian Molton , David Marlin , Yehuda Yitschak , Jani Monoses , Tawfik Bayouk , Dan Frazier , Eran Ben-Avi , Li Li , Leif Lindholm , Sebastian Hesselbarth , Arnd Bergmann , Jon Masters , Ben Dooks , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , Chris Van Hoof , Nicolas Pitre , Maen Suleiman , Shadi Ammouri , Olof Johansson , Eric Miao X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Signed-off-by: Thomas Petazzoni --- arch/arm/mach-kirkwood/common.c | 2 +- arch/arm/plat-orion/common.c | 2 +- drivers/dma/mv_xor.c | 2 +- .../plat => include/linux/platform_data}/mv_xor.h | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) rename {arch/arm/plat-orion/include/plat => include/linux/platform_data}/mv_xor.h (77%) diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index e04bd6f..a3d8836 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include #include "common.h" /***************************************************************************** diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index ebcf727..88dac08 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c @@ -19,8 +19,8 @@ #include #include #include +#include #include -#include #include /* Create a clkdev entry for a given device/clk */ diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 0b12e68..ec9c570 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "dmaengine.h" #include "mv_xor.h" diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/include/linux/platform_data/mv_xor.h similarity index 77% rename from arch/arm/plat-orion/include/plat/mv_xor.h rename to include/linux/platform_data/mv_xor.h index 2ba1f7d..cbfc6e1 100644 --- a/arch/arm/plat-orion/include/plat/mv_xor.h +++ b/include/linux/platform_data/mv_xor.h @@ -1,11 +1,9 @@ /* - * arch/arm/plat-orion/include/plat/mv_xor.h - * * Marvell XOR platform device data definition file. */ -#ifndef __PLAT_MV_XOR_H -#define __PLAT_MV_XOR_H +#ifndef __MV_XOR_PDATA_H +#define __MV_XOR_PDATA_H #include #include