From patchwork Tue Jun 17 07:47:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 4364751 Return-Path: X-Original-To: patchwork-linux-arm@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 09B49BEEAA for ; Tue, 17 Jun 2014 07:51:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B136720279 for ; Tue, 17 Jun 2014 07:51:24 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 524C42020A for ; Tue, 17 Jun 2014 07:51:23 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wwo6b-0003pN-0H; Tue, 17 Jun 2014 07:46:57 +0000 Received: from mail-pb0-x22e.google.com ([2607:f8b0:400e:c01::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wwo5R-0002wr-V6 for linux-arm-kernel@lists.infradead.org; Tue, 17 Jun 2014 07:45:47 +0000 Received: by mail-pb0-f46.google.com with SMTP id md12so4573763pbc.33 for ; Tue, 17 Jun 2014 00:45:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:date:message-id:in-reply-to:references:subject; bh=5oy3TKQLrEjn7/CNFjFemV0qf12RDnoSI1OcgsKfM8o=; b=hmSqpuLFQ3uJkbJec+1P+eBiSXd/l4NOam/9zRtEywBHAbvQ2e12pJvJ3oRsWyWpV+ TMJorMnFeYqGb636Ra6nM1oMzbDu5mOiPllvGtXhGhGuASSAR5RJ5CD+ueS6bg1ecQm6 /vblWEghMmnPIqZ9WeDF1va0ftn+BIPUKANl3/4S0t+h1nvVbJF32g+r08Zj86Xtl2ji RVDHXnyvyRn4qyJ64bur05UCviISDu7QuoQ7YDr5She5Qin4qP2zcZFlktlxvS1gAbA/ iY2bcpGO5ukaaMgYyKefBk0Yl2Q3vAh76IpEYOHROzEnOZfQiKr6JO3Hd5e151utZEho ctOA== X-Received: by 10.66.163.38 with SMTP id yf6mr31230964pab.46.1402991123099; Tue, 17 Jun 2014 00:45:23 -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 ix7sm22515889pbd.36.2014.06.17.00.45.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jun 2014 00:45:22 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Date: Tue, 17 Jun 2014 16:47:29 +0900 Message-Id: <20140617074729.30008.55742.sendpatchset@w520> In-Reply-To: <20140617074658.30008.53021.sendpatchset@w520> References: <20140617074658.30008.53021.sendpatchset@w520> Subject: [PATCH v2 04/08] ARM: shmobile: Move most of irqs.h, keep some for pinctl X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140617_004546_089478_45C17B41 X-CRM114-Status: GOOD ( 14.66 ) X-Spam-Score: -0.8 (/) Cc: arnd@arndb.de, Magnus Damm , horms@verge.net.au, geert@linux-m68k.org, olof@lixom.net, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Move most of irqs.h so it can be used as #include "irqs.h" instead of the old style #include . Legacy code in drivers/pinctrl needs more work to get rid of the "mach" portion of the include path, so some part is left in the original location. Signed-off-by: Magnus Damm Acked-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- Changes since V1: - rebased to v3.16-rc1 arch/arm/mach-shmobile/board-ape6evm.c | 2 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 3 +-- arch/arm/mach-shmobile/board-bockw.c | 2 +- arch/arm/mach-shmobile/board-genmai.c | 2 +- arch/arm/mach-shmobile/board-koelsch-reference.c | 2 +- arch/arm/mach-shmobile/board-koelsch.c | 2 +- arch/arm/mach-shmobile/board-kzm9g.c | 2 +- arch/arm/mach-shmobile/board-lager-reference.c | 2 +- arch/arm/mach-shmobile/board-lager.c | 2 +- arch/arm/mach-shmobile/board-mackerel.c | 5 +---- arch/arm/mach-shmobile/board-marzen-reference.c | 2 +- arch/arm/mach-shmobile/board-marzen.c | 2 +- arch/arm/mach-shmobile/include/mach/irqs.h | 17 ++--------------- arch/arm/mach-shmobile/intc-sh7372.c | 2 +- arch/arm/mach-shmobile/intc-sh73a0.c | 2 +- arch/arm/mach-shmobile/irqs.h | 21 +++++++++++++++++++++ arch/arm/mach-shmobile/setup-r7s72100.c | 2 +- arch/arm/mach-shmobile/setup-r8a73a4.c | 2 +- arch/arm/mach-shmobile/setup-r8a7740.c | 2 +- arch/arm/mach-shmobile/setup-r8a7778.c | 2 +- arch/arm/mach-shmobile/setup-r8a7779.c | 2 +- arch/arm/mach-shmobile/setup-r8a7790.c | 2 +- arch/arm/mach-shmobile/setup-r8a7791.c | 2 +- arch/arm/mach-shmobile/setup-sh7372.c | 2 +- arch/arm/mach-shmobile/setup-sh73a0.c | 2 +- 25 files changed, 46 insertions(+), 42 deletions(-) --- 0001/arch/arm/mach-shmobile/board-ape6evm.c +++ work/arch/arm/mach-shmobile/board-ape6evm.c 2014-06-17 16:03:57.000000000 +0900 @@ -34,10 +34,10 @@ #include #include #include -#include #include #include #include +#include "irqs.h" /* LEDS */ static struct gpio_led ape6evm_leds[] = { --- 0001/arch/arm/mach-shmobile/board-armadillo800eva.c +++ work/arch/arm/mach-shmobile/board-armadillo800eva.c 2014-06-17 16:03:57.000000000 +0900 @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include @@ -61,7 +60,7 @@ #include