From patchwork Thu Jul 31 00:25:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4652451 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 58D91C0338 for ; Thu, 31 Jul 2014 00:23:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8209C201B4 for ; Thu, 31 Jul 2014 00:23:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A63922018E for ; Thu, 31 Jul 2014 00:23:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752742AbaGaAXD (ORCPT ); Wed, 30 Jul 2014 20:23:03 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:64412 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752182AbaGaAXC (ORCPT ); Wed, 30 Jul 2014 20:23:02 -0400 Received: by mail-pd0-f175.google.com with SMTP id r10so2354581pdi.6 for ; Wed, 30 Jul 2014 17:23:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:subject; bh=dHTWqWsip4zaQXwSEbGqTp35QQypYhHXedIVjJHC4yE=; b=VgeeDa3mOTpZt4YjcyEdXH+N2eToVucN8Pdo7C0R2nnRBvTqk0hcCiEB5mGPiy5vpm ottWN6GhvSdc26d81zCGPsT/coBAS29mHOO25d2rvAdaHrAm0Gbdbn/JJs+EUdITJnO4 92B/bSgwKQZfOJQLa2IyiRrByXMEtTI7EzRdUGtM+siZBwWK3sswqtSia+MdY77TZSwT l8xuUDpGRu2gP3xgRSRMf/1SDTdZ+AUj47eNoJYhppM8G9kAJKsg1Gtgf40hng7apIPu OBU6WK0FSrP7bq7qc2JgnK/IbJmIVSmWHNlUu1jIAjhpyz1Lev3/aM1LYb+uKcCPF0aN kqDA== X-Received: by 10.70.103.238 with SMTP id fz14mr64091pdb.153.1406766181633; Wed, 30 Jul 2014 17:23:01 -0700 (PDT) Received: from [127.0.0.1] (s214090.ppp.asahi-net.or.jp. [220.157.214.90]) by mx.google.com with ESMTPSA id am2sm3553382pbc.59.2014.07.30.17.22.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jul 2014 17:23:00 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: olof@lixom.net, Magnus Damm , horms@verge.net.au, geert+renesas@glider.be Date: Thu, 31 Jul 2014 09:25:15 +0900 Message-Id: <20140731002515.30680.1397.sendpatchset@w520> Subject: [PATCH] ARM: shmobile: Rework multiplatform include workaround Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Magnus Damm Now when the majority of the include files have moved from arch/arm/mach-shmobile/include/mach/ to arch/arm/mach-shmobile/ remove the header include file workaround in the Makefile... ... and add another workaround in irqs.h to cope with the fact that needs to be where it is until the PFC code has been updated to remove legacy non-DT interfaces. Signed-off-by: Magnus Damm --- Written against renesas-devel-v3.16-rc7-20140729 arch/arm/mach-shmobile/Makefile | 2 -- arch/arm/mach-shmobile/irqs.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/arm/mach-shmobile/Makefile +++ work/arch/arm/mach-shmobile/Makefile 2014-07-31 09:11:18.000000000 +0900 @@ -2,8 +2,6 @@ # Makefile for the linux kernel. # -ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include - # Common objects obj-y := timer.o console.o --- 0001/arch/arm/mach-shmobile/irqs.h +++ work/arch/arm/mach-shmobile/irqs.h 2014-07-31 09:12:56.000000000 +0900 @@ -2,7 +2,7 @@ #define __SHMOBILE_IRQS_H #include -#include +#include "include/mach/irqs.h" /* GIC */ #define gic_spi(nr) ((nr) + 32)