diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-08-02 02:44:11 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-08-04 13:18:17 +1000 |
| commit | 9c4cb82515130c62224e23fdf7c13c8f6c59c614 (patch) | |
| tree | f916fd843972502d918a1a03bdb99c9c2bbaa91c /arch/powerpc/kernel/process.c | |
| parent | c7c8eede2739289df02a1ab297cc476c6f38dca7 (diff) | |
| download | linux-9c4cb82515130c62224e23fdf7c13c8f6c59c614.tar.gz linux-9c4cb82515130c62224e23fdf7c13c8f6c59c614.tar.bz2 linux-9c4cb82515130c62224e23fdf7c13c8f6c59c614.zip | |
powerpc: Remove use of CONFIG_PPC_MERGE
Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove
the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc
and include/asm-powerpc.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index e030f3bd5024..957bded0020d 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -276,10 +276,8 @@ int set_dabr(unsigned long dabr) { __get_cpu_var(current_dabr) = dabr; -#ifdef CONFIG_PPC_MERGE /* XXX for now */ if (ppc_md.set_dabr) return ppc_md.set_dabr(dabr); -#endif /* XXX should we have a CPU_FTR_HAS_DABR ? */ #if defined(CONFIG_PPC64) || defined(CONFIG_6xx) |