summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-25 07:35:03 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-07-25 07:35:03 +0200
commitc174aff95642bcc830102becb9802adeb8f87a5a (patch)
tree360ad80985487939be071bf0205cdaa5ca88155f /arch
parentfix fs/nfs/nfsroot.c compilation (diff)
parentof-bindings: Add binding documentation for SPI busses and devices (diff)
downloadlinux-c174aff95642bcc830102becb9802adeb8f87a5a.tar.xz
linux-c174aff95642bcc830102becb9802adeb8f87a5a.zip
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/52xx/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/52xx/Kconfig b/arch/powerpc/platforms/52xx/Kconfig
index d664b1bce381..9a51675beb80 100644
--- a/arch/powerpc/platforms/52xx/Kconfig
+++ b/arch/powerpc/platforms/52xx/Kconfig
@@ -1,7 +1,6 @@
config PPC_MPC52xx
bool "52xx-based boards"
depends on PPC_MULTIPLATFORM && PPC32
- select FSL_SOC
select PPC_CLOCK
select PPC_PCI_CHOICE
@@ -48,6 +47,7 @@ config PPC_MPC5200_BUGFIX
config PPC_MPC5200_GPIO
bool "MPC5200 GPIO support"
depends on PPC_MPC52xx
+ select GENERIC_GPIO
select HAVE_GPIO_LIB
help
Enable gpiolib support for mpc5200 based boards