diff options
| author | Jochen Friedrich <jochen@scram.de> | 2008-01-24 16:19:01 +0100 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 08:31:04 -0600 |
| commit | 02753cb608cc2c35dbe670b466eb3b88d063b42e (patch) | |
| tree | 04baaf3a80d5635ee44ea739d65ae23a137b86da /arch | |
| parent | 49b51545ff33734ac1c7e0a28c16ca1f49e51b8a (diff) | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/platforms/8xx/m8xx_setup.c | 3 | ||||
| -rw-r--r-- | arch/powerpc/platforms/8xx/mpc885ads_setup.c | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c index 1867a07d0fa..184f998d1be 100644 --- a/arch/powerpc/platforms/8xx/m8xx_setup.c +++ b/arch/powerpc/platforms/8xx/m8xx_setup.c @@ -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); diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c index bdceb57adc7..3be115e525f 100644 --- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c +++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c @@ -40,6 +40,7 @@ #include <asm/fs_pd.h> #include <asm/udbg.h> +#include "mpc885ads.h" #include "mpc8xx.h" static u32 __iomem *bcsr, *bcsr5; |