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

[POWERPC] 8xx: Get rid of conditional includes of board specific setup

Directly include mpc885ads.h from mpc885ads_setup.c. Now we can get rid
of the arch dependent includes in mpc8xx.h.

Signed-off-by: Jochen Friedrich <jochen@scram.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

authored by

Jochen Friedrich and committed by
Kumar Gala 02753cb6 49b51545

+2 -22
+1 -2
arch/powerpc/platforms/8xx/m8xx_setup.c
··· 16 16 #include <linux/init.h> 17 17 #include <linux/time.h> 18 18 #include <linux/rtc.h> 19 + #include <linux/fsl_devices.h> 19 20 20 21 #include <asm/io.h> 21 22 #include <asm/mpc8xx.h> ··· 29 28 30 29 #include "mpc8xx.h" 31 30 32 - #ifdef CONFIG_PCMCIA_M8XX 33 31 struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops; 34 - #endif 35 32 36 33 extern int cpm_pic_init(void); 37 34 extern int cpm_get_irq(void);
+1
arch/powerpc/platforms/8xx/mpc885ads_setup.c
··· 40 40 #include <asm/fs_pd.h> 41 41 #include <asm/udbg.h> 42 42 43 + #include "mpc885ads.h" 43 44 #include "mpc8xx.h" 44 45 45 46 static u32 __iomem *bcsr, *bcsr5;
-20
include/asm-powerpc/mpc8xx.h
··· 4 4 * file that has to include MPC8xx configuration, they all include 5 5 * this one and the configuration switching is done here. 6 6 */ 7 - #ifdef __KERNEL__ 8 7 #ifndef __CONFIG_8xx_DEFS 9 8 #define __CONFIG_8xx_DEFS 10 9 11 - 12 - #ifdef CONFIG_8xx 13 - 14 - #ifdef CONFIG_FADS 15 - #include <platforms/fads.h> 16 - #endif 17 - 18 - #if defined(CONFIG_MPC86XADS) 19 - #include <platforms/8xx/mpc86xads.h> 20 - #endif 21 - 22 - #if defined(CONFIG_MPC885ADS) 23 - #include <platforms/8xx/mpc885ads.h> 24 - #endif 25 - 26 - #ifdef CONFIG_PCMCIA_M8XX 27 10 extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops; 28 - #endif 29 11 30 - #endif /* CONFIG_8xx */ 31 12 #endif /* __CONFIG_8xx_DEFS */ 32 - #endif /* __KERNEL__ */