From patchwork Tue Sep 11 12:59:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11312 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 8FBF123F26 for ; Tue, 11 Sep 2012 13:00:41 +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 42898A18BF3 for ; Tue, 11 Sep 2012 13:00:41 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so796871iea.11 for ; Tue, 11 Sep 2012 06:00:41 -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=q6983TfP+c75x1y66A+JCv2gdrmCLHo0pfcrORWMKfw=; b=hVlGNWhA2USixQG5kOyUXLvvnuYQYxJS1VVRqi5wndlNWK0ZGB42b24l2OANQVIj4v eJB1iXiMK/RESMi5D881v9Fu1b/eNElYpCX0bnAl0K4BG/933kclrMWdwoWwyHIAeZ5O dYXfgBaXnWfqjPhUsznVeFEnTNG4a/eZBnZADsPPVIj+ST7TEH2p11/f00wkrjyuSxjU FlS8UjxT373lXKNc3fGmq09BAbvOdutoeKWfaqQTb8U0ikovwJTzJT+wE/StbOoT9PLl HqcTcw7HP+4MeSRow/3MVurZT78PHMPKTvh3Hf0YCqzE5htsSx/Je2u+tE6wTtNLT8Gp Vf6g== Received: by 10.50.207.106 with SMTP id lv10mr16956957igc.0.1347368440956; Tue, 11 Sep 2012 06:00:40 -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 ex8csp11896igc; Tue, 11 Sep 2012 06:00:39 -0700 (PDT) Received: by 10.205.129.17 with SMTP id hg17mr4795693bkc.88.1347368439587; Tue, 11 Sep 2012 06:00:39 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.8]) by mx.google.com with ESMTP id hy16si9236055bkc.19.2012.09.11.06.00.39; Tue, 11 Sep 2012 06:00:39 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.8 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.8; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.8 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 0LuYSK-1TbzNX043M-00zr6O; Tue, 11 Sep 2012 14:59:59 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Russell King , Arnd Bergmann , "David S. Miller" , netdev@vger.kernel.org, Sascha Hauer Subject: [PATCH 06/16] ARM: netx: move platform_data definitions Date: Tue, 11 Sep 2012 14:59:40 +0200 Message-Id: <1347368390-31252-6-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:ybdJljPcM7kEsUq5Dd1DcpCUoBiUMwoK0PSS3dxdQjL WbulacZdMj/6ZJdvql+nMZcBcbPEXp6C+K1RqQihUWU/pOXPcd 7+fmmQbysSLDxvbaHMg21aTny4msoI0qn1Oatz15Rj9YsOUZ3D eYjZ9BlQMBXQEOy3BPQTs/3bF7nBu9+jvVk7KRda5aPXWcg8R5 iXo4xHDJF1XR0kHCnJ4+peQQggJD3xRde5QcJCrg02/s/bPdVP 3MHE+Zd9XYxvJd2XYRb6Oar0xL634BsBrubVgnM+xB7hv3oYj4 z11BBz0JPINYlP+0bICQwqQk5rK2gUE3JqM6IbPlZJpXmL6JEM ARrppXpoZAsU1U3dU3hq3KqHxnpZesvWcRAA2H67AS0cj2pAcS f3kkjwtx3O7jBDSSFtCAIiOfXpcR6QAhRs= X-Gm-Message-State: ALoCoQmC3xeFtXWRM+98o7/2aCOFacsXN10DpLDweEyxFicAJh83e7HWjcP7QeT0n3Tj9M+BOGM7 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 netx include directories Signed-off-by: Arnd Bergmann Cc: "David S. Miller" Cc: netdev@vger.kernel.org Cc: Sascha Hauer --- arch/arm/mach-netx/nxdb500.c | 2 +- arch/arm/mach-netx/nxdkn.c | 2 +- arch/arm/mach-netx/nxeb500hmi.c | 2 +- drivers/net/ethernet/netx-eth.c | 2 +- .../include/mach/eth.h => include/linux/platform_data/eth-netx.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/mach-netx/include/mach/eth.h => include/linux/platform_data/eth-netx.h (100%) diff --git a/arch/arm/mach-netx/include/mach/eth.h b/include/linux/platform_data/eth-netx.h similarity index 100% rename from arch/arm/mach-netx/include/mach/eth.h rename to include/linux/platform_data/eth-netx.h diff --git a/arch/arm/mach-netx/nxdb500.c b/arch/arm/mach-netx/nxdb500.c index 180ea89..8b781ff 100644 --- a/arch/arm/mach-netx/nxdb500.c +++ b/arch/arm/mach-netx/nxdb500.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "generic.h" #include "fb.h" diff --git a/arch/arm/mach-netx/nxdkn.c b/arch/arm/mach-netx/nxdkn.c index 58009e2..b26dbce 100644 --- a/arch/arm/mach-netx/nxdkn.c +++ b/arch/arm/mach-netx/nxdkn.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "generic.h" diff --git a/arch/arm/mach-netx/nxeb500hmi.c b/arch/arm/mach-netx/nxeb500hmi.c index 122e998..257382e 100644 --- a/arch/arm/mach-netx/nxeb500hmi.c +++ b/arch/arm/mach-netx/nxeb500hmi.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "generic.h" #include "fb.h" diff --git a/drivers/net/ethernet/netx-eth.c b/drivers/net/ethernet/netx-eth.c index 9d11ab7..63e7af4 100644 --- a/drivers/net/ethernet/netx-eth.c +++ b/drivers/net/ethernet/netx-eth.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include /* XC Fifo Offsets */ #define EMPTY_PTR_FIFO(xcno) (0 + ((xcno) << 3)) /* Index of the empty pointer FIFO */