Merge remote-tracking branch 'kumar/next' into next

[~andy/linux] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 9089ae71334a6a2011c78c17720692f397a8d1cb..34d224be93ba223fcd48b45e32a165281f409907 100644 (file)
--- 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