From: Paul Mundt <lethal@linux-sh.org>
Date: Thu, 10 May 2012 02:51:07 +0000 (+0900)
Subject: Merge branch 'sh/rsk-updates' into sh-latest
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=15f99cbd071aa402e113d342448603344a337046;p=deliverable%2Flinux.git

Merge branch 'sh/rsk-updates' into sh-latest

Conflicts:
	arch/sh/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

15f99cbd071aa402e113d342448603344a337046
diff --cc arch/sh/Kconfig
index 98405fa24e81,44a22dd86134..65bdb5da79c5
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -594,7 -591,8 +601,8 @@@ config SH_CLK_CP
  config SH_CLK_CPG_LEGACY
  	depends on SH_CLK_CPG
  	def_bool y if !CPU_SUBTYPE_SH7785 && !ARCH_SHMOBILE && \
- 		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && !CPU_SUBTYPE_SH7734
+ 		      !CPU_SHX3 && !CPU_SUBTYPE_SH7757 && \
 -		      !CPU_SUBTYPE_SH7264
++		      !CPU_SUBTYPE_SH7734 && !CPU_SUBTYPE_SH7264
  
  source "kernel/time/Kconfig"