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: 1486591 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B1AC9DF2D2 for ; Thu, 20 Sep 2012 16:38:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750839Ab2ITQiL (ORCPT ); Thu, 20 Sep 2012 12:38:11 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:62034 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750766Ab2ITQiK (ORCPT ); Thu, 20 Sep 2012 12:38:10 -0400 Received: by pbbrr4 with SMTP id rr4so576248pbb.19 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=NiTUI9kiWVkTR8j6iB4sqThXUVfbs2DduKU3D/cyhM95f6iAIqOSkLsUUgALl31k7p 0S5pj/kRYBzsGsNoEazo9rWmcZGgIMOMoZEJqONJ6rwwf4UTMfFlB0WOWL9pOw2tFITp ASqYYVERHb5yrxs+eVmg+qKaqj1P4urmLDGPnDhu8AwEcx7phKj/SZ7log69F88YXEVs ZvLF2FnrhIdYQzjPy9VpoVK1caACJBB25M+pbD+Dsczej3YCmRnKm2U4olE1jR2C564I nid95fS6JWrqlBqx+4vIS28TH0UZuoYtlu2JxebXBs965P3pm+mn5fD2jc6TpuC3SirD Xriw== 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 Cc: Tony Lindgren , linux-omap , linux-arm-kernel 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: ALoCoQng1e6XTHIYWEAwXTecaE54FNeTmUnrSzLsnBtu8NBjBn5jWtOdT2rUj29RL5C98tv9ivaH Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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"