diff options
author | Jochen Friedrich <jochen@scram.de> | 2008-01-24 10:19:01 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 09:31:04 -0500 |
commit | 02753cb608cc2c35dbe670b466eb3b88d063b42e (patch) | |
tree | 04baaf3a80d5635ee44ea739d65ae23a137b86da /include/asm-powerpc | |
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 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/mpc8xx.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/asm-powerpc/mpc8xx.h b/include/asm-powerpc/mpc8xx.h index 2be014b6f57c..98f3c4f17328 100644 --- a/include/asm-powerpc/mpc8xx.h +++ b/include/asm-powerpc/mpc8xx.h | |||
@@ -4,29 +4,9 @@ | |||
4 | * file that has to include MPC8xx configuration, they all include | 4 | * file that has to include MPC8xx configuration, they all include |
5 | * this one and the configuration switching is done here. | 5 | * this one and the configuration switching is done here. |
6 | */ | 6 | */ |
7 | #ifdef __KERNEL__ | ||
8 | #ifndef __CONFIG_8xx_DEFS | 7 | #ifndef __CONFIG_8xx_DEFS |
9 | #define __CONFIG_8xx_DEFS | 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 | extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops; | 10 | extern struct mpc8xx_pcmcia_ops m8xx_pcmcia_ops; |
28 | #endif | ||
29 | 11 | ||
30 | #endif /* CONFIG_8xx */ | ||
31 | #endif /* __CONFIG_8xx_DEFS */ | 12 | #endif /* __CONFIG_8xx_DEFS */ |
32 | #endif /* __KERNEL__ */ | ||