PWN-Hunter/android_kernel_xiaomi_sdm845
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Jochen Friedrich 2008-01-24 16:19:01 +01:00 committed by Kumar Gala
parent 49b51545ff
commit 02753cb608
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/powerpc/platforms/8xx/m8xx_setup.c
View File

@ -16,6 +16,7 @@
#include <linux/init.h>
#include <linux/time.h>
#include <linux/rtc.h>
#include <linux/fsl_devices.h>
#include <asm/io.h>
#include <asm/mpc8xx.h>
@ -28,9 +29,7 @@
#include "mpc8xx.h"
#ifdef CONFIG_PCMCIA_M8XX
struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
#endif
extern int cpm_pic_init(void);
extern int cpm_get_irq(void);

1
arch/powerpc/platforms/8xx/mpc885ads_setup.c
View File

@ -40,6 +40,7 @@
#include <asm/fs_pd.h>
#include <asm/udbg.h>
#include "mpc885ads.h"
#include "mpc8xx.h"
static u32 __iomem *bcsr, *bcsr5;

20
include/asm-powerpc/mpc8xx.h
View File

@ -4,29 +4,9 @@
* file that has to include MPC8xx configuration, they all include
* this one and the configuration switching is done here.
*/
#ifdef __KERNEL__
#ifndef __CONFIG_8xx_DEFS
#define __CONFIG_8xx_DEFS
#ifdef CONFIG_8xx
#ifdef CONFIG_FADS
#include <platforms/fads.h>
#endif
#if defined(CONFIG_MPC86XADS)
#include <platforms/8xx/mpc86xads.h>
#endif
#if defined(CONFIG_MPC885ADS)
#include <platforms/8xx/mpc885ads.h>
#endif
#ifdef CONFIG_PCMCIA_M8XX
extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;
#endif
#endif /* CONFIG_8xx */
#endif /* __CONFIG_8xx_DEFS */
#endif /* __KERNEL__ */