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

powerpc/include: Declare mpc8xx_immr in 8xx_immap.h 



Do the same as for cmp2_immr : declare it at the same place
as its type immap_t, that is in 8xx_immap.h instead of fs_pd.h

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/62d490b65899c2f2667ca7045c5f0fad9cbda458.1691474658.git.christophe.leroy@csgroup.eu
parent 60bc069c

arch/powerpc/include/asm/8xx_immap.h

+2 −0
Original line number Diff line number Diff line
@@ -560,5 +560,7 @@ typedef struct immap { 
	cpm8xx_t	im_cpm;		/* Communication processor */

} immap_t;



extern immap_t __iomem *mpc8xx_immr;



#endif /* __IMMAP_8XX__ */

#endif /* __KERNEL__ */

arch/powerpc/include/asm/fs_pd.h

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ 
#ifdef CONFIG_PPC_8xx

#include <asm/8xx_immap.h>



extern immap_t __iomem *mpc8xx_immr;



#define immr_map(member) (&mpc8xx_immr->member)

#define immr_map_size(member, size) (&mpc8xx_immr->member)

#define immr_unmap(addr) do {} while (0)

arch/powerpc/platforms/8xx/adder875.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <asm/time.h>

#include <asm/machdep.h>

#include <asm/cpm1.h>

#include <asm/fs_pd.h>

#include <asm/8xx_immap.h>

#include <asm/udbg.h>



#include "mpc8xx.h"

arch/powerpc/platforms/8xx/mpc86xads_setup.c

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

#include <asm/8xx_immap.h>

#include <asm/cpm1.h>

#include <asm/fs_pd.h>

#include <asm/udbg.h>



#include "mpc86xads.h"

arch/powerpc/platforms/8xx/mpc885ads_setup.c

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

#include <asm/8xx_immap.h>

#include <asm/cpm1.h>

#include <asm/fs_pd.h>

#include <asm/udbg.h>



#include "mpc885ads.h"