From 65b489261f5415dde42dc674817f204c62de3340 Mon Sep 17 00:00:00 2001
From: Timur Tabi <timur@freescale.com>
Date: Tue, 21 Feb 2012 13:53:15 -0600
Subject: [PATCH] --- yaml --- r: 292583 b: refs/heads/master c:
 0c350a9a5cf01db3875ceb8b01121d8ce6a7f287 h: refs/heads/master i:   292581:
 0860894886bf7108ab43dae8ec8ea9b6b34423d6   292579:
 1e4fe5e6856686e841894ef24caaf05d442a61ad   292575:
 d42a2e9178cb301d3755e9ac6ec78c9c3aa77116 v: v3

---
 [refs]                                           | 2 +-
 trunk/arch/powerpc/configs/mpc85xx_defconfig     | 1 +
 trunk/arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
 trunk/arch/powerpc/platforms/85xx/Kconfig        | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e45f674b511..2761fbd854d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 401a376e94021f2040e6cedd4cc858e0eeec5854
+refs/heads/master: 0c350a9a5cf01db3875ceb8b01121d8ce6a7f287
diff --git a/trunk/arch/powerpc/configs/mpc85xx_defconfig b/trunk/arch/powerpc/configs/mpc85xx_defconfig
index f37a2ab48881..5fb0c8a94811 100644
--- a/trunk/arch/powerpc/configs/mpc85xx_defconfig
+++ b/trunk/arch/powerpc/configs/mpc85xx_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC_85xx=y
+CONFIG_PHYS_64BIT=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
diff --git a/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig b/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig
index abdcd317cda7..fb51bc90edd2 100644
--- a/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/trunk/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -1,4 +1,5 @@
 CONFIG_PPC_85xx=y
+CONFIG_PHYS_64BIT=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=8
 CONFIG_EXPERIMENTAL=y
diff --git a/trunk/arch/powerpc/platforms/85xx/Kconfig b/trunk/arch/powerpc/platforms/85xx/Kconfig
index fd6f3c06a0dc..ce6142cd04a1 100644
--- a/trunk/arch/powerpc/platforms/85xx/Kconfig
+++ b/trunk/arch/powerpc/platforms/85xx/Kconfig
@@ -90,7 +90,6 @@ config P1010_RDB
 config P1022_DS
 	bool "Freescale P1022 DS"
 	select DEFAULT_UIMAGE
-	select PHYS_64BIT	# The DTS has 36-bit addresses
 	select SWIOTLB
 	help
 	  This option enables support for the Freescale P1022DS reference board.