Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02753cb6 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Kumar Gala
Browse files

[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: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 49b51545

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/time.h>

#include <linux/time.h>

#include <linux/rtc.h>

#include <linux/rtc.h>

#include <linux/fsl_devices.h>





#include <asm/io.h>

#include <asm/io.h>

#include <asm/mpc8xx.h>

#include <asm/mpc8xx.h>
@@ -28,9 +29,7 @@ 




#include "mpc8xx.h"

#include "mpc8xx.h"





#ifdef CONFIG_PCMCIA_M8XX

struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;

struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;

#endif





extern int cpm_pic_init(void);

extern int cpm_pic_init(void);

extern int cpm_get_irq(void);

extern int cpm_get_irq(void);

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

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

#include <asm/fs_pd.h>

#include <asm/udbg.h>

#include <asm/udbg.h>





#include "mpc885ads.h"

#include "mpc8xx.h"

#include "mpc8xx.h"





static u32 __iomem *bcsr, *bcsr5;

static u32 __iomem *bcsr, *bcsr5;

include/asm-powerpc/mpc8xx.h

+0 −20
Original line number Original line Diff line number Diff line
@@ -4,29 +4,9 @@ 
 * file that has to include MPC8xx configuration, they all include

 * file that has to include MPC8xx configuration, they all include

 * this one and the configuration switching is done here.

 * this one and the configuration switching is done here.

 */

 */

#ifdef __KERNEL__

#ifndef __CONFIG_8xx_DEFS

#ifndef __CONFIG_8xx_DEFS

#define __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;

extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops;

#endif





#endif /* CONFIG_8xx */

#endif /* __CONFIG_8xx_DEFS */
 
#endif /* __CONFIG_8xx_DEFS */
 
#endif /* __KERNEL__ */