diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-28 02:10:53 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-28 02:10:53 -0400 |
| commit | 489244498ec99c949ecbd7105299066cff283dcd (patch) | |
| tree | 003b5637cb8998ca0ab524e436c1a5eff25a9a1c /include/asm-powerpc | |
| parent | 649e85797259162f7fdc696420e7492f20226f2d (diff) | |
| parent | 9ad494f62444ee37209e85173377c67612e66ef1 (diff) | |
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 @@ | |||
| 19 | 19 | ||
| 20 | #ifdef CONFIG_PPC_86xx | 20 | #ifdef CONFIG_PPC_86xx |
| 21 | 21 | ||
| 22 | #ifdef CONFIG_MPC8641_HPCN | ||
| 23 | #include <platforms/86xx/mpc8641_hpcn.h> | ||
| 24 | #endif | ||
| 25 | |||
| 26 | #define _IO_BASE isa_io_base | 22 | #define _IO_BASE isa_io_base |
| 27 | #define _ISA_MEM_BASE isa_mem_base | 23 | #define _ISA_MEM_BASE isa_mem_base |
| 28 | #ifdef CONFIG_PCI | 24 | #ifdef CONFIG_PCI |