diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 01:35:03 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-25 01:35:03 -0400 |
| commit | c174aff95642bcc830102becb9802adeb8f87a5a (patch) | |
| tree | 360ad80985487939be071bf0205cdaa5ca88155f /arch/powerpc | |
| parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) | |
| parent | 79c28acb2b7d66ca48d23e1c8b5e9e043aa634f8 (diff) | |
Merge commit 'gcl/gcl-next'
Diffstat (limited to 'arch/powerpc')
| -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 @@ | |||
| 1 | config PPC_MPC52xx | 1 | config PPC_MPC52xx |
| 2 | bool "52xx-based boards" | 2 | bool "52xx-based boards" |
| 3 | depends on PPC_MULTIPLATFORM && PPC32 | 3 | depends on PPC_MULTIPLATFORM && PPC32 |
| 4 | select FSL_SOC | ||
| 5 | select PPC_CLOCK | 4 | select PPC_CLOCK |
| 6 | select PPC_PCI_CHOICE | 5 | select PPC_PCI_CHOICE |
| 7 | 6 | ||
| @@ -48,6 +47,7 @@ config PPC_MPC5200_BUGFIX | |||
| 48 | config PPC_MPC5200_GPIO | 47 | config PPC_MPC5200_GPIO |
| 49 | bool "MPC5200 GPIO support" | 48 | bool "MPC5200 GPIO support" |
| 50 | depends on PPC_MPC52xx | 49 | depends on PPC_MPC52xx |
| 50 | select GENERIC_GPIO | ||
| 51 | select HAVE_GPIO_LIB | 51 | select HAVE_GPIO_LIB |
| 52 | help | 52 | help |
| 53 | Enable gpiolib support for mpc5200 based boards | 53 | Enable gpiolib support for mpc5200 based boards |