diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 06:57:20 -0400 |
| commit | 36a23fc8aa0c72ecafe7aaee0a823b03b301e1df (patch) | |
| tree | 364aa8cf248b477d822d0344d7bba3c80f86cf9c /include | |
| parent | 23386fe572028ca0f9249fb3c71ed31b54cf1665 (diff) | |
| parent | fc215fe7e6f0420afee0e0987fcc311929ee662f (diff) | |
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ppc/mpc8260.h | 4 | ||||
| -rw-r--r-- | include/asm-ppc/mpc8xx.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/include/asm-ppc/mpc8260.h b/include/asm-ppc/mpc8260.h index 23579d4afae7..402ba15c2e80 100644 --- a/include/asm-ppc/mpc8260.h +++ b/include/asm-ppc/mpc8260.h | |||
| @@ -35,10 +35,6 @@ | |||
| 35 | #include <platforms/tqm8260.h> | 35 | #include <platforms/tqm8260.h> |
| 36 | #endif | 36 | #endif |
| 37 | 37 | ||
| 38 | #if defined(CONFIG_PQ2ADS) || defined (CONFIG_PQ2FADS) | ||
| 39 | #include <platforms/pq2ads.h> | ||
| 40 | #endif | ||
| 41 | |||
| 42 | #ifdef CONFIG_PCI_8260 | 38 | #ifdef CONFIG_PCI_8260 |
| 43 | #include <syslib/m82xx_pci.h> | 39 | #include <syslib/m82xx_pci.h> |
| 44 | #endif | 40 | #endif |
diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index d3a2f2fe230c..b9e3060b0278 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h | |||
| @@ -63,10 +63,6 @@ | |||
| 63 | #include <platforms/lantec.h> | 63 | #include <platforms/lantec.h> |
| 64 | #endif | 64 | #endif |
| 65 | 65 | ||
| 66 | #if defined(CONFIG_MPC885ADS) | ||
| 67 | #include <platforms/mpc885ads.h> | ||
| 68 | #endif | ||
| 69 | |||
| 70 | /* Currently, all 8xx boards that support a processor to PCI/ISA bridge | 66 | /* Currently, all 8xx boards that support a processor to PCI/ISA bridge |
| 71 | * use the same memory map. | 67 | * use the same memory map. |
| 72 | */ | 68 | */ |