From 6a29372da14b23f9086a4bfa70837d35d645f1ef Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 20 Oct 2008 08:03:46 +0000 Subject: [PATCH] --- yaml --- r: 116942 b: refs/heads/master c: dbc1c5c250cbedccf3571597d156e581e34b2944 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8643f703f137..1d21db82ea72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3ba68f969b2407b6809a840f6ff45ab0eb06f84 +refs/heads/master: dbc1c5c250cbedccf3571597d156e581e34b2944 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index c171f5bcf258..bbe149c26518 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -19,9 +19,6 @@ config WORD_SIZE default 64 if PPC64 default 32 if !PPC64 -config PPC_MERGE - def_bool y - config MMU bool default y