diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 20:14:47 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-09-09 20:14:47 -0500 |
commit | d344c5e0856ad03278d8700b503762dbc8b86e12 (patch) | |
tree | a6d893a643470a3c2580a58f3228a55fa1fd1d82 /include/asm-ppc/mpc8xx.h | |
parent | 010988e888a0abbe7118635c1b33d049caae6b29 (diff) | |
parent | 87fc767b832ef5a681a0ff9d203c3289bc3be2bf (diff) | |
download | op-kernel-dev-d344c5e0856ad03278d8700b503762dbc8b86e12.zip op-kernel-dev-d344c5e0856ad03278d8700b503762dbc8b86e12.tar.gz |
Manual merge with Linus
Diffstat (limited to 'include/asm-ppc/mpc8xx.h')
-rw-r--r-- | include/asm-ppc/mpc8xx.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-ppc/mpc8xx.h b/include/asm-ppc/mpc8xx.h index 7c31f2d..dc8e598 100644 --- a/include/asm-ppc/mpc8xx.h +++ b/include/asm-ppc/mpc8xx.h @@ -36,10 +36,6 @@ #include <platforms/tqm8xx.h> #endif -#if defined(CONFIG_SPD823TS) -#include <platforms/spd8xx.h> -#endif - #if defined(CONFIG_IVMS8) || defined(CONFIG_IVML24) #include <platforms/ivms8.h> #endif |