summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/Kconfig
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-30 11:10:09 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-04-30 11:10:09 +1000
commitbc23100a0d646aedb6e17fbcecdc35a24cd3bf2a (patch)
treeafbf44b177d17a8450d606b6d976e76e8e964273 /arch/powerpc/platforms/Kconfig
parent28bf41a1fedad76e9b4de70c9573bb3f8afc3709 (diff)
parent9e2ecdbba3b0745f9ed454ab86961e3ccf9dc224 (diff)
downloadlinux-stable-bc23100a0d646aedb6e17fbcecdc35a24cd3bf2a.tar.gz
linux-stable-bc23100a0d646aedb6e17fbcecdc35a24cd3bf2a.tar.bz2
linux-stable-bc23100a0d646aedb6e17fbcecdc35a24cd3bf2a.zip
Merge remote-tracking branch 'kumar/next' into next
From Kumar Gala: << Add support for T4 and B4 SoC families from Freescale, e6500 altivec support, some various board fixes and other minor cleanups. >>
Diffstat (limited to 'arch/powerpc/platforms/Kconfig')
-rw-r--r--arch/powerpc/platforms/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 9089ae71334a..34d224be93ba 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -343,7 +343,6 @@ config FSL_ULI1575
config CPM
bool
- select PPC_CLOCK
config OF_RTC
bool