diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /include/asm-ppc/mpc8xx.h | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'include/asm-ppc/mpc8xx.h')
| -rw-r--r-- | include/asm-ppc/mpc8xx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index 714d69c819d3..7c31f2d564a1 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h | |||
| @@ -68,6 +68,10 @@ | |||
| 68 | #include <platforms/lantec.h> | 68 | #include <platforms/lantec.h> |
| 69 | #endif | 69 | #endif |
| 70 | 70 | ||
| 71 | #if defined(CONFIG_MPC885ADS) | ||
| 72 | #include <platforms/mpc885ads.h> | ||
| 73 | #endif | ||
| 74 | |||
| 71 | /* Currently, all 8xx boards that support a processor to PCI/ISA bridge | 75 | /* Currently, all 8xx boards that support a processor to PCI/ISA bridge |
| 72 | * use the same memory map. | 76 | * use the same memory map. |
| 73 | */ | 77 | */ |