---

yaml --- r: 370843 b: refs/heads/master c: cb2cfb8 h: refs/heads/master i: 370841: d8c529e 370839: 69ddf7b v: v3
git-mirror · Mar 12, 2013 · e5258a1 · e5258a1
1 parent 1063f14
commit e5258a1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -344,7 +344,6 @@ config FSL_ULI1575
 
 config CPM
 	bool
-	select PPC_CLOCK
 
 config OF_RTC
 	bool
-Original file line number
+Diff line change
@@ Expand Up / @@ -344,7 +344,6 @@ config FSL_ULI1575 @@
     config CPM
     	bool
-    	select PPC_CLOCK
     config OF_RTC
     	bool
@@ Expand Down @@