diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-25 16:41:00 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 09:33:09 -0500 |
commit | 3155f7f23f7865e64f7eb14e226a2dff8197e51f (patch) | |
tree | 1ab72855399616a248c967a15b6a2801a751f2d5 /arch/ppc/kernel | |
parent | 80f4ec7f5b81e7e238acfaf50ac82489b5fcee6f (diff) |
[PPC] Remove 83xx from arch/ppc
83xx 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')
-rw-r--r-- | arch/ppc/kernel/ppc_ksyms.c | 3 | ||||
-rw-r--r-- | arch/ppc/kernel/setup.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c index 0d53dc378c7d..ba729ce2071c 100644 --- a/arch/ppc/kernel/ppc_ksyms.c +++ b/arch/ppc/kernel/ppc_ksyms.c | |||
@@ -244,8 +244,7 @@ EXPORT_SYMBOL(debugger_fault_handler); | |||
244 | EXPORT_SYMBOL(cpm_install_handler); | 244 | EXPORT_SYMBOL(cpm_install_handler); |
245 | EXPORT_SYMBOL(cpm_free_handler); | 245 | EXPORT_SYMBOL(cpm_free_handler); |
246 | #endif /* CONFIG_8xx */ | 246 | #endif /* CONFIG_8xx */ |
247 | #if defined(CONFIG_8xx) || defined(CONFIG_40x) || defined(CONFIG_85xx) ||\ | 247 | #if defined(CONFIG_8xx) || defined(CONFIG_40x) || defined(CONFIG_85xx) |
248 | defined(CONFIG_83xx) | ||
249 | EXPORT_SYMBOL(__res); | 248 | EXPORT_SYMBOL(__res); |
250 | #endif | 249 | #endif |
251 | 250 | ||
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 3c453029f1c5..5888ae6a4ac8 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
@@ -38,7 +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) || defined(CONFIG_83xx) || \ | 41 | #define USES_PPC_SYS (defined(CONFIG_85xx) || \ |
42 | defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ | 42 | defined(CONFIG_MPC10X_BRIDGE) || defined(CONFIG_8260) || \ |
43 | defined(CONFIG_PPC_MPC52xx)) | 43 | defined(CONFIG_PPC_MPC52xx)) |
44 | 44 | ||