diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 15:35:03 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 15:35:03 +1000 |
commit | c174aff95642bcc830102becb9802adeb8f87a5a (patch) | |
tree | 360ad80985487939be071bf0205cdaa5ca88155f /arch/powerpc/platforms | |
parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
parent | 79c28acb2b7d66ca48d23e1c8b5e9e043aa634f8 (diff) | |
download | linux-c174aff95642bcc830102becb9802adeb8f87a5a.tar.gz linux-c174aff95642bcc830102becb9802adeb8f87a5a.tar.bz2 linux-c174aff95642bcc830102becb9802adeb8f87a5a.zip |
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/52xx/Kconfig | 2 |
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 |