From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759789AbbCDTgV (ORCPT ); Wed, 4 Mar 2015 14:36:21 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:64324 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758554AbbCDTeL (ORCPT ); Wed, 4 Mar 2015 14:34:11 -0500 From: Arnd Bergmann To: linux-arm-msm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, David Brown , Daniel Walker , Bryan Huntsman , Stephen Boyd , Tim Bird , Bjorn Andersson , Linus Walleij , linux-kernel@vger.kernel.org, Greg Kroah-Hartman , Ulf Hansson , Arnd Bergmann Subject: [RFC PATCH 16/18] ARM: msm: make msm_smd.h global Date: Wed, 4 Mar 2015 20:33:10 +0100 Message-Id: <1425497592-1831064-17-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1425497592-1831064-1-git-send-email-arnd@arndb.de> References: <1425497592-1831064-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:McZHvSfBg3uie7iJVTtS392uLjTLT6RxxHv5mJt8kZloGtkK2jy 57ZB2tPrx+2G2OA13HyhwSSGkAjDLYit/4/vLz6Mt1u4I3Qgs4wm0Xn0miNLTdW1VarxMot M/lMtFgEGY3YWxxIJE6C1TRSRNV3eHhcHa51vZ2Y1B2ncyEmPSq0DWsjm0tdNf45YzF0v8/ x1uehUlhqkDcpwjI+1XQQ== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is one of several approaches to the problem of this header file not being visible on ARCH_MULTIPLATFORM otherwise. Signed-off-by: Arnd Bergmann --- arch/arm/mach-msm/smd.c | 6 +++--- drivers/char/msm_smd_pkt.c | 2 +- drivers/tty/serial/msm_smd_tty.c | 2 +- {arch/arm/mach-msm/include/mach => include/linux}/msm_smd.h | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename {arch/arm/mach-msm/include/mach => include/linux}/msm_smd.h (100%) diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c index b87f183a86c5..b50b495ab281 100644 --- a/arch/arm/mach-msm/smd.c +++ b/arch/arm/mach-msm/smd.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "smd_private.h" #include "proc_comm.h" @@ -59,14 +59,14 @@ enum { static int msm_smd_debug_mask; -struct shared_info { +struct msm_smd_shared_info { int ready; void __iomem *state; }; static unsigned dummy_state[SMSM_STATE_COUNT]; -static struct shared_info smd_info = { +static struct msm_smd_shared_info smd_info = { /* FIXME: not a real __iomem pointer */ .state = &dummy_state, }; diff --git a/drivers/char/msm_smd_pkt.c b/drivers/char/msm_smd_pkt.c index ba82a06d9684..2ee28ed77791 100644 --- a/drivers/char/msm_smd_pkt.c +++ b/drivers/char/msm_smd_pkt.c @@ -31,7 +31,7 @@ #include #include -#include +#include #define NUM_SMD_PKT_PORTS 9 #define DEVICE_NAME "smdpkt" diff --git a/drivers/tty/serial/msm_smd_tty.c b/drivers/tty/serial/msm_smd_tty.c index 1238ac370bff..246b81c316c0 100644 --- a/drivers/tty/serial/msm_smd_tty.c +++ b/drivers/tty/serial/msm_smd_tty.c @@ -24,7 +24,7 @@ #include #include -#include +#include #define MAX_SMD_TTYS 32 diff --git a/arch/arm/mach-msm/include/mach/msm_smd.h b/include/linux/msm_smd.h similarity index 100% rename from arch/arm/mach-msm/include/mach/msm_smd.h rename to include/linux/msm_smd.h -- 2.1.0.rc2