From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 21 Oct 2008 04:52:04 +0000 (+1100)
Subject: Merge commit 'origin' into master
X-Git-Tag: v2.6.28-rc1~58^2~11
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=a02efb906d12c9d4eb2ab7c59049ba9545e5412d;p=linux-2.6-omap-h63xx.git

Merge commit 'origin' into master

Manual merge of:

	arch/powerpc/Kconfig
	arch/powerpc/include/asm/page.h
---

a02efb906d12c9d4eb2ab7c59049ba9545e5412d
diff --cc arch/powerpc/Kconfig
index bbe149c2651,9391199d9e7..369d93e7377
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -19,6 -19,12 +19,9 @@@ config WORD_SIZ
  	default 64 if PPC64
  	default 32 if !PPC64
  
 -config PPC_MERGE
 -	def_bool y
 -
+ config ARCH_PHYS_ADDR_T_64BIT
+        def_bool PPC64 || PHYS_64BIT
+ 
  config MMU
  	bool
  	default y