diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-30 04:36:03 (GMT) |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-30 04:36:03 (GMT) |
commit | 3a1a8acf690873f0ee2d8a648c2ec185f4294bd2 (patch) | |
tree | 4cd633c0836f7bb30c3ce28d9b85ac0e5c21a7e2 /arch/powerpc/platforms/Kconfig | |
parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
parent | cf0d19fb3032ebf2cf8e5217da00f51dc025aa8e (diff) | |
download | linux-3a1a8acf690873f0ee2d8a648c2ec185f4294bd2.tar.xz |
Merge commit 'kumar/kumar-next'
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r-- | arch/powerpc/platforms/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig index 1d09687..4c900ef 100644 --- a/arch/powerpc/platforms/Kconfig +++ b/arch/powerpc/platforms/Kconfig @@ -254,6 +254,8 @@ config CPM2 select CPM select PPC_LIB_RHEAP select PPC_PCI_CHOICE + select ARCH_REQUIRE_GPIOLIB + select GENERIC_GPIO help The CPM2 (Communications Processor Module) is a coprocessor on embedded CPUs made by Freescale. Selecting this option means that @@ -281,6 +283,7 @@ config FSL_ULI1575 config CPM bool + select PPC_CLOCK config OF_RTC bool |