---

yaml --- r: 116942 b: refs/heads/master c: dbc1c5c h: refs/heads/master v: v3
git-mirror · Oct 21, 2008 · 6a29372 · 6a29372
1 parent 24371f4
commit 6a29372
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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