Commit 4d5c5bad authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Remove asm/prom.h from asm/mpc52xx.h and asm/pci.h 



asm/pci.h and asm/mpc52xx.h don't need asm/prom.h

Declare struct device_node locally to avoid including of.h

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Add missing include of prom.h to of_rtc.c]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/cf5243343e2364c2b40f22ee5ad9a6e2453d1121.1657264228.git.christophe.leroy@csgroup.eu
parent 4177ab22

arch/powerpc/include/asm/mpc52xx.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 




#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__

#include <asm/types.h>

#include <asm/types.h>

#include <asm/prom.h>

#include <asm/mpc5xxx.h>

#include <asm/mpc5xxx.h>

#endif /* __ASSEMBLY__ */

#endif /* __ASSEMBLY__ */
@@ -268,6 +267,8 @@ struct mpc52xx_intr { 




#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





struct device_node;



/* mpc52xx_common.c */

/* mpc52xx_common.c */

extern void mpc5200_setup_xlb_arbiter(void);

extern void mpc5200_setup_xlb_arbiter(void);

extern void mpc52xx_declare_of_platform_devices(void);

extern void mpc52xx_declare_of_platform_devices(void);

arch/powerpc/include/asm/pci.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 




#include <asm/machdep.h>

#include <asm/machdep.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/prom.h>

#include <asm/pci-bridge.h>

#include <asm/pci-bridge.h>





/* Return values for pci_controller_ops.probe_mode function */

/* Return values for pci_controller_ops.probe_mode function */

arch/powerpc/kernel/prom.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include <asm/dt_cpu_ftrs.h>

#include <asm/dt_cpu_ftrs.h>

#include <asm/drmem.h>

#include <asm/drmem.h>

#include <asm/ultravisor.h>

#include <asm/ultravisor.h>

#include <asm/prom.h>





#include <mm/mmu_decl.h>

#include <mm/mmu_decl.h>

arch/powerpc/sysdev/of_rtc.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,8 @@ 
#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/slab.h>

#include <linux/slab.h>





#include <asm/prom.h>



static __initdata struct {

static __initdata struct {

	const char *compatible;

	const char *compatible;

	char *plat_name;

	char *plat_name;