diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-27 15:06:14 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 09:33:10 -0500 |
| commit | c42f3ad7f1bf17f31c3febdc71034ed6d793d40f (patch) | |
| tree | 5a56c44717cf8fe4a5f402370506e5fbb78368e4 /arch/ppc/kernel/setup.c | |
| parent | 3155f7f23f7865e64f7eb14e226a2dff8197e51f (diff) | |
[PPC] Remove 85xx from arch/ppc
85xx exists in arch/powerpc as well as cuImage support to boot from
a u-boot that doesn't support device trees.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/ppc/kernel/setup.c')
| -rw-r--r-- | arch/ppc/kernel/setup.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 5888ae6a4ac8..d51368d72e39 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
| @@ -38,8 +38,7 @@ | |||
| 38 | #include <asm/xmon.h> | 38 | #include <asm/xmon.h> |
| 39 | #include <asm/ocp.h> | 39 | #include <asm/ocp.h> |
| 40 | 40 | ||
| 41 | #define USES_PPC_SYS (defined(CONFIG_85xx) || \ | 41 | #define USES_PPC_SYS (defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ |
| 42 | defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ | ||
| 43 | defined(CONFIG_PPC_MPC52xx)) | 42 | defined(CONFIG_PPC_MPC52xx)) |
| 44 | 43 | ||
| 45 | #if USES_PPC_SYS | 44 | #if USES_PPC_SYS |