diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/asm-ppc/ibm4xx.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/asm-ppc/ibm4xx.h')
| -rw-r--r-- | include/asm-ppc/ibm4xx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-ppc/ibm4xx.h b/include/asm-ppc/ibm4xx.h index 6c28ae7807f4..38f99710752b 100644 --- a/include/asm-ppc/ibm4xx.h +++ b/include/asm-ppc/ibm4xx.h | |||
| @@ -51,6 +51,10 @@ | |||
| 51 | #include <platforms/4xx/xilinx_ml300.h> | 51 | #include <platforms/4xx/xilinx_ml300.h> |
| 52 | #endif | 52 | #endif |
| 53 | 53 | ||
| 54 | #if defined(CONFIG_XILINX_ML403) | ||
| 55 | #include <platforms/4xx/xilinx_ml403.h> | ||
| 56 | #endif | ||
| 57 | |||
| 54 | #ifndef __ASSEMBLY__ | 58 | #ifndef __ASSEMBLY__ |
| 55 | 59 | ||
| 56 | #ifdef CONFIG_40x | 60 | #ifdef CONFIG_40x |