Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/62d490b65899c2f2667ca7045c5f0fad9cbda458.1691474658.git.christophe.leroy@csgroup.eu

authored by

Christophe Leroy and committed by
Michael Ellerman
e6e077cb 60bc069c

+3 -5
+2
arch/powerpc/include/asm/8xx_immap.h
··· 560 560 cpm8xx_t im_cpm; /* Communication processor */ 561 561 } immap_t; 562 562 563 + extern immap_t __iomem *mpc8xx_immr; 564 + 563 565 #endif /* __IMMAP_8XX__ */ 564 566 #endif /* __KERNEL__ */
-2
arch/powerpc/include/asm/fs_pd.h
··· 29 29 #ifdef CONFIG_PPC_8xx 30 30 #include <asm/8xx_immap.h> 31 31 32 - extern immap_t __iomem *mpc8xx_immr; 33 - 34 32 #define immr_map(member) (&mpc8xx_immr->member) 35 33 #define immr_map_size(member, size) (&mpc8xx_immr->member) 36 34 #define immr_unmap(addr) do {} while (0)
+1 -1
arch/powerpc/platforms/8xx/adder875.c
··· 13 13 #include <asm/time.h> 14 14 #include <asm/machdep.h> 15 15 #include <asm/cpm1.h> 16 - #include <asm/fs_pd.h> 16 + #include <asm/8xx_immap.h> 17 17 #include <asm/udbg.h> 18 18 19 19 #include "mpc8xx.h"
-1
arch/powerpc/platforms/8xx/mpc86xads_setup.c
··· 24 24 #include <asm/time.h> 25 25 #include <asm/8xx_immap.h> 26 26 #include <asm/cpm1.h> 27 - #include <asm/fs_pd.h> 28 27 #include <asm/udbg.h> 29 28 30 29 #include "mpc86xads.h"
-1
arch/powerpc/platforms/8xx/mpc885ads_setup.c
··· 37 37 #include <asm/time.h> 38 38 #include <asm/8xx_immap.h> 39 39 #include <asm/cpm1.h> 40 - #include <asm/fs_pd.h> 41 40 #include <asm/udbg.h> 42 41 43 42 #include "mpc885ads.h"