From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri, 25 Jul 2008 05:35:03 +0000 (+1000)
Subject: Merge commit 'gcl/gcl-next'
X-Git-Tag: v2.6.27-rc1~222^2~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c174aff95642bcc830102becb9802adeb8f87a5a;p=linux-2.6

Merge commit 'gcl/gcl-next'
---

c174aff95642bcc830102becb9802adeb8f87a5a
diff --cc arch/powerpc/platforms/52xx/Kconfig
index d664b1bce3,c1ca4f3ee5..9a51675beb
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@@ -1,9 -1,7 +1,8 @@@
  config PPC_MPC52xx
  	bool "52xx-based boards"
  	depends on PPC_MULTIPLATFORM && PPC32
- 	select FSL_SOC
  	select PPC_CLOCK
 +	select PPC_PCI_CHOICE
  
  config PPC_MPC5200_SIMPLE
  	bool "Generic support for simple MPC5200 based boards"