From patchwork Thu Sep 20 16:38:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1486601 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 19DAEDF2D2 for ; Thu, 20 Sep 2012 16:40:04 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TEjlb-0004eG-EX; Thu, 20 Sep 2012 16:38:20 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TEjlX-0004cl-Q3 for linux-arm-kernel@lists.infradead.org; Thu, 20 Sep 2012 16:38:16 +0000 Received: by pbbrq8 with SMTP id rq8so5698419pbb.36 for ; Thu, 20 Sep 2012 09:38:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:organization:date:message-id:user-agent :mime-version:content-type:x-gm-message-state; bh=ut2UiBVqFHhjqPq3EJzJQFU65tfz9epLb8bs5oQSx6g=; b=KSW41k70rtwgO5XS7MvW+mZwjWAapH/JGxFsp1o/TkKSB4uZQD90awxl39gYNsCUPu Cs9P4kj8sosZ9wLdHHqQGbCZdwzrO/b7ldEFDkV83Rh0AuI3mW2mh/HWzIdwltxegTxK 1iaCt1Or0/fqjn1Qk2DjxF43ZJD40usvR9kt2Q2cYAiZVJjdqJD5Urqw3Z4NSFaPuGVC 5d1iadlZET8rFodRmyNglX170i7G+vWryz0y6sb67m2HtksNAOQXNXyGYQASMydVIyoK Zy2coUWUJQK7882iPs9DmwC20o/G23hMt/jUWRnkMxMDrTv5vAOoDPF6Z7/tR9XcQTX5 REFA== Received: by 10.68.202.193 with SMTP id kk1mr8146415pbc.136.1348159090378; Thu, 20 Sep 2012 09:38:10 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id qd9sm891647pbb.31.2012.09.20.09.38.09 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 20 Sep 2012 09:38:09 -0700 (PDT) From: Kevin Hilman To: Arnd Bergmann , Olof Johansson Subject: arm-soc/for-next: fixup compile after platform_data move Organization: Deep Root Systems, LLC Date: Thu, 20 Sep 2012 09:38:14 -0700 Message-ID: <87obl0hcp5.fsf@deeprootsystems.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQnzKRFfzTLR9YrKw5fWc5acQUDUYR/5xumK56q9tT+u8NKr6ACN5F37A+SCAQQ4WUzjEQ0d X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Tony Lindgren , linux-omap , linux-arm-kernel 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Arnd, Olof, Not sure if this has been reported yet, but arm-soc/for-next now has a build error on omap due to the recent merge of the platform_data move series. The arm-soc/next/soc branch contains the arm-soc/omap/am33xx branch which adds an include of "plat/mscpi.h" which has now moved. Below is a simple fix. Kevin From cae062932d1d28e499b03d31da815fc2696badfd Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Thu, 20 Sep 2012 09:28:43 -0700 Subject: [PATCH] ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move AM33xx hwmod data includes "mcspi.h" which has now been moved after the platform_data move. Fix it. Signed-off-by: Kevin Hilman Acked-by: Tony Lindgren --- arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c index 22433cb..59d5c1c 100644 --- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c @@ -17,9 +17,9 @@ #include #include #include +#include #include #include -#include #include #include "omap_hwmod_common_data.h"