diff options
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 e030f3bd502..957bded0020 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)  |