From patchwork Mon Nov 30 23:00:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7730951 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 86AA4BEEE1 for ; Mon, 30 Nov 2015 23:02:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5DA8A20664 for ; Mon, 30 Nov 2015 23:02:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2960D2066C for ; Mon, 30 Nov 2015 23:02:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755101AbbK3XB6 (ORCPT ); Mon, 30 Nov 2015 18:01:58 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:64770 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753968AbbK3XB5 (ORCPT ); Mon, 30 Nov 2015 18:01:57 -0500 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue102) with ESMTPSA (Nemesis) id 0Lakjg-1ajF2a23JI-00kMty; Tue, 01 Dec 2015 00:01:16 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Tony Lindgren , linux-omap@vger.kernel.org, Greg Ungerer , Sekhar Nori , Kevin Hilman , Wan ZongShun , Jason Cooper , Andrew Lunn , Gregory Clement , Arnd Bergmann Subject: [PATCH 1/7] ARM: omap1: make headers more local Date: Tue, 1 Dec 2015 00:00:52 +0100 Message-Id: <1448924458-3279040-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1448924458-3279040-1-git-send-email-arnd@arndb.de> References: <1448924458-3279040-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:Eb6dN/0Q5YArr5z86apDZ26hOrxBgYzPzUTSGA0F/4F+iBTf5gr Od24+/SbuDM/Rmo/+xWzhtHsG3aJNo5cTInmv2i/qMSWopCrUWkXtPnn+ebf0oKJMQD0qnC Rr4rqFAFcXmBTXFc5DW55IEGqMjNz5Dfuz5VjVz0mgWQ8ON7VoPqL0/Wri9xF1bKTW7W/6Q Wmcho8ZxHazYkHacBwGAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:BsKNxYATYUU=:3MVj7fujKUQsEBcwYReOjh ndx2ztsbDvoCx0ypjLuXQN8iSQoUknv8/XPNiSdZwtw/NTlAkMISF6VgSkuqWfuZ5lGkCnagP YHsjS07BKq0z9XtzFU92EInEU2SyExGD1LJAxQkliN/HMZt5L8Zno2tMWUy077YzkjnZ8rHx2 gIA5tYb9JXAXCFAYj7s65uWzwqHhQ3hPukjBast1vNfBWEqrjeXpk6PPKZLR9GH1PRE/XXf2g bpe68dVZqVFxQ0dKh3TNNSONSn8AilWg40tSyG0m/Au5bK9Tc+Qy/b2YSXwq9A8HU8SCKmufE ja/vsBLjxQ4SLnIUttaAAZjaGh8NUXyyOGLW8oOAJNwkfi98XIleDDI0uoLC4flB4hy+EBPaQ hmjvbX6u16As6OtwG/uuG5qFFFDBYdXaUZDR1uNB7lgKApDbhL03mWaRqXQfAqk+lCkNh6nl0 /7z88O95n2/zkWFTnYBq6sMrqKoe+Eq95eUOG7ifBpnLsgH6dbqDmhSs85sOvjPuCsh66vde/ XR6q+Gcw/r/HEi+ZA4HwmB5sAUNZFMsSWRTO5gNEUOU9wzSndRhYjMB7ks4Qi+1t5fJdUK08d J+K5LbQBXO6MfyTdDE/FAiqlIgwMC3yAlEr7R13ghH/lsisd76eokW3Ach9iPHPx6kJgnKhBF fQDLFMGzEb4eyEJzZSvELXALW1GnAH14+qODNHVeI4YclhadwDQgK4GSe70mfFK8EgFA= Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, 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 Some header files are never included outside of a mach-omap1 directory and do not need to be made visible in include/mach, so let's just move them all down one level. Signed-off-by: Arnd Bergmann Acked-by: Tony Lindgren --- arch/arm/mach-omap1/board-ams-delta.c | 2 +- arch/arm/mach-omap1/board-fsample.c | 2 +- arch/arm/mach-omap1/board-h2.c | 2 +- arch/arm/mach-omap1/board-h3.c | 2 +- arch/arm/mach-omap1/board-innovator.c | 2 +- arch/arm/mach-omap1/board-osk.c | 2 +- arch/arm/mach-omap1/board-palmte.c | 2 +- arch/arm/mach-omap1/board-palmtt.c | 2 +- arch/arm/mach-omap1/board-palmz71.c | 2 +- arch/arm/mach-omap1/board-perseus2.c | 2 +- arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- arch/arm/mach-omap1/board-sx1.c | 4 ++-- arch/arm/mach-omap1/{include/mach => }/board-sx1.h | 0 arch/arm/mach-omap1/{include/mach => }/camera.h | 0 arch/arm/mach-omap1/devices.c | 2 +- arch/arm/mach-omap1/flash.c | 2 +- arch/arm/mach-omap1/{include/mach => }/flash.h | 0 17 files changed, 15 insertions(+), 15 deletions(-) rename arch/arm/mach-omap1/{include/mach => }/board-sx1.h (100%) rename arch/arm/mach-omap1/{include/mach => }/camera.h (100%) rename arch/arm/mach-omap1/{include/mach => }/flash.h (100%) diff --git a/arch/arm/mach-omap1/include/mach/flash.h b/arch/arm/mach-omap1/flash.h similarity index 100% rename from arch/arm/mach-omap1/include/mach/flash.h rename to arch/arm/mach-omap1/flash.h diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index a95499ea8706..9fc70978823b 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c @@ -41,7 +41,7 @@ #include #include -#include +#include "camera.h" #include #include "iomap.h" diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c index 0fb51d22c8b5..fad95b74bb65 100644 --- a/arch/arm/mach-omap1/board-fsample.c +++ b/arch/arm/mach-omap1/board-fsample.c @@ -29,7 +29,7 @@ #include #include -#include +#include "flash.h" #include #include diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index 8340d684d8b6..cd146ed0538d 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -42,7 +42,7 @@ #include #include #include -#include +#include "flash.h" #include #include diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 086ff34e072b..f7c8c63dd532 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -44,7 +44,7 @@ #include #include #include -#include +#include "flash.h" #include #include diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index ed4e045c2ad8..ae90bd02b3bf 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -32,7 +32,7 @@ #include #include -#include +#include "flash.h" #include #include diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 0efd165b8227..209aecb0df68 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -46,7 +46,7 @@ #include #include -#include +#include "flash.h" #include #include diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index 1142ae431fe0..e5288cda1a6a 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c @@ -34,7 +34,7 @@ #include #include -#include +#include "flash.h" #include #include #include diff --git a/arch/arm/mach-omap1/board-palmtt.c b/arch/arm/mach-omap1/board-palmtt.c index 54a547a96950..d672495f7441 100644 --- a/arch/arm/mach-omap1/board-palmtt.c +++ b/arch/arm/mach-omap1/board-palmtt.c @@ -34,7 +34,7 @@ #include #include -#include +#include "flash.h" #include #include #include diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index 87ec04ae40dd..aaf741b0aff6 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c @@ -36,7 +36,7 @@ #include #include -#include +#include "flash.h" #include #include #include diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index 3d76f05407f0..150b57ba42bf 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c @@ -30,7 +30,7 @@ #include #include -#include +#include "flash.h" #include diff --git a/arch/arm/mach-omap1/board-sx1-mmc.c b/arch/arm/mach-omap1/board-sx1-mmc.c index 4fcf19c78a08..a9373570bbb1 100644 --- a/arch/arm/mach-omap1/board-sx1-mmc.c +++ b/arch/arm/mach-omap1/board-sx1-mmc.c @@ -16,7 +16,7 @@ #include #include -#include +#include "board-sx1.h" #include "mmc.h" diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c index 939991ea33d5..6c482254b37c 100644 --- a/arch/arm/mach-omap1/board-sx1.c +++ b/arch/arm/mach-omap1/board-sx1.c @@ -34,11 +34,11 @@ #include #include -#include +#include "flash.h" #include #include #include -#include +#include "board-sx1.h" #include #include diff --git a/arch/arm/mach-omap1/include/mach/board-sx1.h b/arch/arm/mach-omap1/board-sx1.h similarity index 100% rename from arch/arm/mach-omap1/include/mach/board-sx1.h rename to arch/arm/mach-omap1/board-sx1.h diff --git a/arch/arm/mach-omap1/include/mach/camera.h b/arch/arm/mach-omap1/camera.h similarity index 100% rename from arch/arm/mach-omap1/include/mach/camera.h rename to arch/arm/mach-omap1/camera.h diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 325e6030095e..263c07a566cb 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c @@ -25,7 +25,7 @@ #include #include -#include +#include "camera.h" #include #include "common.h" diff --git a/arch/arm/mach-omap1/flash.c b/arch/arm/mach-omap1/flash.c index b3fb531af94e..99cda402e1e2 100644 --- a/arch/arm/mach-omap1/flash.c +++ b/arch/arm/mach-omap1/flash.c @@ -11,7 +11,7 @@ #include #include -#include +#include "flash.h" #include