diff options
author | Paul Mackerras <paulus@samba.org> | 2008-04-24 20:57:20 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-24 20:57:20 +1000 |
commit | 36a23fc8aa0c72ecafe7aaee0a823b03b301e1df (patch) | |
tree | 364aa8cf248b477d822d0344d7bba3c80f86cf9c /include | |
parent | 23386fe572028ca0f9249fb3c71ed31b54cf1665 (diff) | |
parent | fc215fe7e6f0420afee0e0987fcc311929ee662f (diff) | |
download | blackbird-op-linux-36a23fc8aa0c72ecafe7aaee0a823b03b301e1df.tar.gz blackbird-op-linux-36a23fc8aa0c72ecafe7aaee0a823b03b301e1df.zip |
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 @@ #include <platforms/tqm8260.h> #endif -#if defined(CONFIG_PQ2ADS) || defined (CONFIG_PQ2FADS) -#include <platforms/pq2ads.h> -#endif - #ifdef CONFIG_PCI_8260 #include <syslib/m82xx_pci.h> #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 @@ #include <platforms/lantec.h> #endif -#if defined(CONFIG_MPC885ADS) -#include <platforms/mpc885ads.h> -#endif - /* Currently, all 8xx boards that support a processor to PCI/ISA bridge * use the same memory map. */ |