diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-10-12 09:06:32 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-12 09:06:32 +1000 |
| commit | 8087ebd5a121ac6bf5a8eba2459c01d3659c3e31 (patch) | |
| tree | 31394658c138dcb130a229af03e3beefca8db642 /include/asm-powerpc/fs_pd.h | |
| parent | 895532a166010d8d8b4d58d63d21012eced22492 (diff) | |
| parent | 4d9e55103aec1ba7d0617cfd88412ec39e1e2d32 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.24
Diffstat (limited to 'include/asm-powerpc/fs_pd.h')
| -rw-r--r-- | include/asm-powerpc/fs_pd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-powerpc/fs_pd.h b/include/asm-powerpc/fs_pd.h index 64706a0532d..9361cd5342c 100644 --- a/include/asm-powerpc/fs_pd.h +++ b/include/asm-powerpc/fs_pd.h @@ -19,8 +19,6 @@ #if defined(CONFIG_8260) #include <asm/mpc8260.h> -#elif defined(CONFIG_85xx) -#include <asm/mpc85xx.h> #endif #define cpm2_map(member) (&cpm2_immr->member) |