diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-28 16:10:53 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-28 16:10:53 +1000 |
| commit | 489244498ec99c949ecbd7105299066cff283dcd (patch) | |
| tree | 003b5637cb8998ca0ab524e436c1a5eff25a9a1c /include/asm-powerpc | |
| parent | 649e85797259162f7fdc696420e7492f20226f2d (diff) | |
| parent | 9ad494f62444ee37209e85173377c67612e66ef1 (diff) | |
| download | blackbird-op-linux-489244498ec99c949ecbd7105299066cff283dcd.tar.gz blackbird-op-linux-489244498ec99c949ecbd7105299066cff283dcd.zip | |
Merge branch 'for_paulus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/mpc86xx.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-powerpc/mpc86xx.h b/include/asm-powerpc/mpc86xx.h index 1ed72f6b1210..f260382739fa 100644 --- a/include/asm-powerpc/mpc86xx.h +++ b/include/asm-powerpc/mpc86xx.h @@ -19,10 +19,6 @@ #ifdef CONFIG_PPC_86xx -#ifdef CONFIG_MPC8641_HPCN -#include <platforms/86xx/mpc8641_hpcn.h> -#endif - #define _IO_BASE isa_io_base #define _ISA_MEM_BASE isa_mem_base #ifdef CONFIG_PCI |
