diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 22:13:30 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 22:13:30 +0300 |
commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
tree | 9b08af78085334af44414adafe0096276f8fe0ff /include/asm-ppc/ibm4xx.h | |
parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
download | linux-5a84d159061d914c8dd4aa372ac6e9529c2be453.tar.xz |
Merge ARM fixes
Diffstat (limited to 'include/asm-ppc/ibm4xx.h')
-rw-r--r-- | include/asm-ppc/ibm4xx.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h index 499c14691c71..92fd02d7b177 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h @@ -15,6 +15,7 @@ #define __ASM_IBM4XX_H__ #include <asm/types.h> +#include <asm/dcr.h> #ifdef CONFIG_40x @@ -108,6 +109,10 @@ void ppc4xx_init(unsigned long r3, unsigned long r4, unsigned long r5, #include <platforms/4xx/ocotea.h> #endif +#if defined(CONFIG_TAISHAN) +#include <platforms/4xx/taishan.h> +#endif + #ifndef __ASSEMBLY__ #ifdef CONFIG_40x /* |