From patchwork Tue Sep 11 12:59:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11308 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id A92B123F26 for ; Tue, 11 Sep 2012 13:00:15 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 15BD7A18116 for ; Tue, 11 Sep 2012 13:00:14 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so795973iea.11 for ; Tue, 11 Sep 2012 06:00:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=CDzjoseO5fY6KjycqcJSPnxBCKBBeZ5by7AvJc+r8gQ=; b=S/GMhyULaekJ/Sx+ulet/jbSKdcxRa5fQ1h4QGwS/JaV32nB7FhnIPDFYDMctWNDuQ Mc3Zs/Q9kgyvzocLKs3CXt6C5poupigX6F/gEn6d0jzkUJchhW2HhOnPkOzgrDa9WOUY tCd3mIxjo/F52qOs/XctqE9jIO60GhG4DhlGtutuhlCYBxUoW68g75N9ETgM2plYhEmL 6MmNvzIPBOLfAty65Vqf3cl84c/QbcJryPv4ZnuF6lyIq+WsyyHHPy3Haast+psB5n/8 FT3vE5CLjdRySf3htvSb2cWtowPQVY1SQFBFp5KIQ+4u+zf0RKjM5EiycLlXIgwZURaO XJsw== Received: by 10.50.45.162 with SMTP id o2mr17001517igm.0.1347368414825; Tue, 11 Sep 2012 06:00:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp11880igc; Tue, 11 Sep 2012 06:00:13 -0700 (PDT) Received: by 10.204.130.151 with SMTP id t23mr4867933bks.94.1347368413161; Tue, 11 Sep 2012 06:00:13 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTP id hy16si9227829bkc.57.2012.09.11.06.00.12; Tue, 11 Sep 2012 06:00:13 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from klappe2.boeblingen.de.ibm.com (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Lxrpw-1TfGdA0cxI-015LHI; Tue, 11 Sep 2012 15:00:00 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Russell King , Arnd Bergmann , Samuel Ortiz , Jochen Friedrich Subject: [PATCH 08/16] ARM: sa1100: move platform_data definitions Date: Tue, 11 Sep 2012 14:59:42 +0200 Message-Id: <1347368390-31252-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1347368390-31252-1-git-send-email-arnd@arndb.de> References: <1347368350-31212-1-git-send-email-arnd@arndb.de> <1347368390-31252-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:aFlRbDTadonri+rLe55y+tYT5mNdf/w+K4PIY4yJgPN iC1ByEJ+m9I6ryl2C1+YBsCUDGCfIvsWh9LrSHGrGvyBf+L9t6 Nme0ROoAjKkR2D0CRAVRxRIcV7NnsX3Dqbqk5v5Px3RZbx3s9b IT2zobk7tcNZbc8eG+3llm+Cj/cgVLxnWFIkl2K2wZzm0/Z0Mi qSXP/eXHjHv0uOzNhxNunY5FPiZF/feP9gXeMM7yBwEQ4oYZWA wmECAyMCcZvxVJCMfCazi4QrN54zdYlCyriN95cZ6e8T+9jbzI 7FWilQXlboep0yKKbwVIRemhXAUnXTmvmOKs/R4xrgEZnRmWGn XjkjVmxaw81Zw/wgoM8qs/gyEGC62usUrMFqqRFfJH9v30hGDm 6aY8F8dzjyvB6rjub9B/PZtsT7bdo70HXo= X-Gm-Message-State: ALoCoQnuBb0wx4ou0TRO40e2TRHNGsYo6HecXjR8l/BrXd9rjgUVLRLg9dEg26BAhpL7FlKN5kIe Platform data for device drivers should be defined in include/linux/platform_data/*.h, not in the architecture and platform specific directories. This moves such data out of the sa1100 include directories Signed-off-by: Arnd Bergmann Cc: Samuel Ortiz Cc: Jochen Friedrich --- arch/arm/mach-sa1100/assabet.c | 2 +- arch/arm/mach-sa1100/cerf.c | 2 +- arch/arm/mach-sa1100/collie.c | 2 +- arch/arm/mach-sa1100/lart.c | 2 +- arch/arm/mach-sa1100/shannon.c | 2 +- arch/arm/mach-sa1100/simpad.c | 2 +- drivers/mfd/mcp-sa11x0.c | 2 +- .../mach/mcp.h => include/linux/platform_data/mfd-mcp-sa11x0.h | 0 8 files changed, 7 insertions(+), 7 deletions(-) rename arch/arm/mach-sa1100/include/mach/mcp.h => include/linux/platform_data/mfd-mcp-sa11x0.h (100%) diff --git a/arch/arm/mach-sa1100/include/mach/mcp.h b/include/linux/platform_data/mfd-mcp-sa11x0.h similarity index 100% rename from arch/arm/mach-sa1100/include/mach/mcp.h rename to include/linux/platform_data/mfd-mcp-sa11x0.h diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index d673211..ba49241 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include "generic.h" diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index 09d7f4b..985d0b5 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include "generic.h" diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index ea5cff3..170cb61 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include "generic.h" diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c index b775a0a..7dc1a89 100644 --- a/arch/arm/mach-sa1100/lart.c +++ b/arch/arm/mach-sa1100/lart.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include "generic.h" diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index 5d33fc3..ff6b7b3 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index fbd5359..c73e1a3 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c index c54e244..f99d629 100644 --- a/drivers/mfd/mcp-sa11x0.c +++ b/drivers/mfd/mcp-sa11x0.c @@ -24,7 +24,7 @@ #include #include -#include +#include #define DRIVER_NAME "sa11x0-mcp"