diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-22 05:47:47 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-22 05:47:47 -0400 |
| commit | 55308c3712f56279d5547ef6e97d365ac3ab9e6d (patch) | |
| tree | efa60b533b83ab55baf90791cb3bf19bfe325d08 /include | |
| parent | 8833843c877cca459ab7b9fee661523bf25b98d1 (diff) | |
| parent | c18bcf45c46f72f630cbbddc79a765336b79ab4f (diff) | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/mpc85xx.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h index f47002a60edf..4f844ebe7669 100644 --- a/include/asm-ppc/mpc85xx.h +++ b/include/asm-ppc/mpc85xx.h | |||
| @@ -28,6 +28,9 @@ | |||
| 28 | #if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS) | 28 | #if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS) |
| 29 | #include <platforms/85xx/mpc8555_cds.h> | 29 | #include <platforms/85xx/mpc8555_cds.h> |
| 30 | #endif | 30 | #endif |
| 31 | #ifdef CONFIG_MPC85xx_CDS | ||
| 32 | #include <platforms/85xx/mpc85xx_cds.h> | ||
| 33 | #endif | ||
| 31 | #ifdef CONFIG_MPC8560_ADS | 34 | #ifdef CONFIG_MPC8560_ADS |
| 32 | #include <platforms/85xx/mpc8560_ads.h> | 35 | #include <platforms/85xx/mpc8560_ads.h> |
| 33 | #endif | 36 | #endif |