diff options
| -rw-r--r-- | arch/arc/kernel/mcip.c | 2 | ||||
| -rw-r--r-- | arch/arc/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/arc/plat-axs10x/axs10x.c | 2 | ||||
| -rw-r--r-- | include/soc/arc/mcip.h (renamed from arch/arc/include/asm/mcip.h) | 8 |
4 files changed, 5 insertions, 9 deletions
diff --git a/arch/arc/kernel/mcip.c b/arch/arc/kernel/mcip.c index f39142acc89e..560c4afc2af4 100644 --- a/arch/arc/kernel/mcip.c +++ b/arch/arc/kernel/mcip.c @@ -11,8 +11,8 @@ #include <linux/smp.h> #include <linux/irq.h> #include <linux/spinlock.h> +#include <soc/arc/mcip.h> #include <asm/irqflags-arcv2.h> -#include <asm/mcip.h> #include <asm/setup.h> static DEFINE_RAW_SPINLOCK(mcip_lock); diff --git a/arch/arc/kernel/time.c b/arch/arc/kernel/time.c index 417d32e031d3..ec1b896f27b2 100644 --- a/arch/arc/kernel/time.c +++ b/arch/arc/kernel/time.c @@ -40,7 +40,7 @@ #include <asm/irq.h> #include <asm/arcregs.h> -#include <asm/mcip.h> +#include <soc/arc/mcip.h> /* Timer related Aux registers */ #define ARC_REG_TIMER0_LIMIT 0x23 /* timer 0 limit */ diff --git a/arch/arc/plat-axs10x/axs10x.c b/arch/arc/plat-axs10x/axs10x.c index 86548701023c..38ff349d7f2a 100644 --- a/arch/arc/plat-axs10x/axs10x.c +++ b/arch/arc/plat-axs10x/axs10x.c @@ -21,7 +21,7 @@ #include <asm/asm-offsets.h> #include <asm/io.h> #include <asm/mach_desc.h> -#include <asm/mcip.h> +#include <soc/arc/mcip.h> #define AXS_MB_CGU 0xE0010000 #define AXS_MB_CREG 0xE0011000 diff --git a/arch/arc/include/asm/mcip.h b/include/soc/arc/mcip.h index fc28d0944801..6902c2a8bd23 100644 --- a/arch/arc/include/asm/mcip.h +++ b/include/soc/arc/mcip.h @@ -8,10 +8,8 @@ * published by the Free Software Foundation. */ -#ifndef __ASM_MCIP_H -#define __ASM_MCIP_H - -#ifdef CONFIG_ISA_ARCV2 +#ifndef __SOC_ARC_MCIP_H +#define __SOC_ARC_MCIP_H #include <soc/arc/aux.h> @@ -103,5 +101,3 @@ static inline void __mcip_cmd_data(unsigned int cmd, unsigned int param, } #endif - -#endif |