From e5258a103e7fb1709b1bb8baf322e4698ec1d621 Mon Sep 17 00:00:00 2001 From: Tang Yuantian Date: Tue, 12 Mar 2013 14:43:03 +0800 Subject: [PATCH] --- yaml --- r: 370843 b: refs/heads/master c: cb2cfb8ffa42a7dc9a67e5b5ba79a7b1b0b27345 h: refs/heads/master i: 370841: d8c529e210a9c95692274485a0021e99b659e1fb 370839: 69ddf7bc6acd45d74b2385872685e0386d825242 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/Kconfig | 1 - trunk/arch/powerpc/platforms/Kconfig | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fe63fc9214fd..cb93c6400215 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e612bc71b5f54433f5ea8cc0e5af1f4e60f1217 +refs/heads/master: cb2cfb8ffa42a7dc9a67e5b5ba79a7b1b0b27345 diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig index b89d7eb730a2..9146b9d1170a 100644 --- a/trunk/arch/powerpc/Kconfig +++ b/trunk/arch/powerpc/Kconfig @@ -685,7 +685,6 @@ config SBUS config FSL_SOC bool select HAVE_CAN_FLEXCAN if NET && CAN - select PPC_CLOCK config FSL_PCI bool diff --git a/trunk/arch/powerpc/platforms/Kconfig b/trunk/arch/powerpc/platforms/Kconfig index 52de8bccfb30..6b29ab1316f7 100644 --- a/trunk/arch/powerpc/platforms/Kconfig +++ b/trunk/arch/powerpc/platforms/Kconfig @@ -344,7 +344,6 @@ config FSL_ULI1575 config CPM bool - select PPC_CLOCK config OF_RTC bool