Use the linux/platform_data/pic32.h include instead of asm/mach-pic32/pic32.h so that the asm variant can be dropped. This is in preparation for allowing some drivers to be compiled on other architectures with COMPILE_TEST enabled. Signed-off-by: Brian Masney <bmasney@redhat.com> --- To: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- arch/mips/pic32/common/reset.c | 2 +- arch/mips/pic32/pic32mzda/config.c | 3 +-- arch/mips/pic32/pic32mzda/early_clk.c | 2 +- arch/mips/pic32/pic32mzda/early_console.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/mips/pic32/common/reset.c b/arch/mips/pic32/common/reset.c index 19db57bfffbd314b6e75d2eb9237540c4139dd83..230db4bad1dd14de1bc23e5ac417e890dec7bf31 100644 --- a/arch/mips/pic32/common/reset.c +++ b/arch/mips/pic32/common/reset.c @@ -5,9 +5,9 @@ */ #include <linux/init.h> #include <linux/io.h> +#include <linux/platform_data/pic32.h> #include <linux/pm.h> #include <asm/reboot.h> -#include <asm/mach-pic32/pic32.h> #define PIC32_RSWRST 0x10 diff --git a/arch/mips/pic32/pic32mzda/config.c b/arch/mips/pic32/pic32mzda/config.c index 73be5689e0dfb8b18c0a44ee860ca2786201471e..fc21cbc11f7d6b75b15e5c6747a1a5f34c1d5d8e 100644 --- a/arch/mips/pic32/pic32mzda/config.c +++ b/arch/mips/pic32/pic32mzda/config.c @@ -5,10 +5,9 @@ */ #include <linux/init.h> #include <linux/io.h> +#include <linux/platform_data/pic32.h> #include <linux/spinlock.h> -#include <asm/mach-pic32/pic32.h> - #include "pic32mzda.h" #define PIC32_CFGCON 0x0000 diff --git a/arch/mips/pic32/pic32mzda/early_clk.c b/arch/mips/pic32/pic32mzda/early_clk.c index 63727799d49a963d3b0d47d39ec5770c283047dc..21a9f6687f6d7129cc271e7a4aae0bbca6f94630 100644 --- a/arch/mips/pic32/pic32mzda/early_clk.c +++ b/arch/mips/pic32/pic32mzda/early_clk.c @@ -4,7 +4,7 @@ * Copyright (C) 2015 Microchip Technology Inc. All rights reserved. */ #include <linux/io.h> -#include <asm/mach-pic32/pic32.h> +#include <linux/platform_data/pic32.h> #include "pic32mzda.h" diff --git a/arch/mips/pic32/pic32mzda/early_console.c b/arch/mips/pic32/pic32mzda/early_console.c index 8afe4e636ace20b1e4269a6172fa5763afebc980..1b7631d12d1f29d580ef9087e20fd92aa99fb497 100644 --- a/arch/mips/pic32/pic32mzda/early_console.c +++ b/arch/mips/pic32/pic32mzda/early_console.c @@ -4,7 +4,7 @@ * Copyright (C) 2015 Microchip Technology Inc. All rights reserved. */ #include <linux/io.h> -#include <asm/mach-pic32/pic32.h> +#include <linux/platform_data/pic32.h> #include <asm/fw/fw.h> #include <asm/setup.h> -- 2.52.0