aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorGravatar Christophe Leroy <christophe.leroy@csgroup.eu> 2023-08-08 08:04:39 +0200
committerGravatar Michael Ellerman <mpe@ellerman.id.au> 2023-08-16 23:54:47 +1000
commite6e077cb2aa4ffb8b320f9a1464f29a21986a901 (patch)
tree04e988e7459ffd73978499bfb4093a19db008a25 /arch/powerpc/include
parentpowerpc/include: Remove unneeded #include <asm/fs_pd.h> (diff)
downloadlinux-e6e077cb2aa4ffb8b320f9a1464f29a21986a901.tar.gz
linux-e6e077cb2aa4ffb8b320f9a1464f29a21986a901.tar.bz2
linux-e6e077cb2aa4ffb8b320f9a1464f29a21986a901.zip
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
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/8xx_immap.h2
-rw-r--r--arch/powerpc/include/asm/fs_pd.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/8xx_immap.h b/arch/powerpc/include/asm/8xx_immap.h
index bdf0563ba423..f9cac46a95cb 100644
--- a/arch/powerpc/include/asm/8xx_immap.h
+++ b/arch/powerpc/include/asm/8xx_immap.h
@@ -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__ */
diff --git a/arch/powerpc/include/asm/fs_pd.h b/arch/powerpc/include/asm/fs_pd.h
index 8def56ec05c6..2b2b52b7451d 100644
--- a/arch/powerpc/include/asm/fs_pd.h
+++ b/arch/powerpc/include/asm/fs_pd.h
@@ -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)