From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 6 Jan 2010 06:49:08 +0000 (+0900)
Subject: Merge branch 'master' into sh/hw-breakpoints
X-Git-Tag: v2.6.34-rc1~285^2~136^3
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=fa94ddea2b29fdda7640672c8a933dbd901f0278;hp=-c;p=cascardo%2Flinux.git

Merge branch 'master' into sh/hw-breakpoints
---

fa94ddea2b29fdda7640672c8a933dbd901f0278
diff --combined arch/sh/Kconfig
index f971cb74dd62,2121fbb2ff4c..812395e7c4d7
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -42,8 -42,6 +42,8 @@@ config SUPERH3
  	select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
  	select HAVE_FUNCTION_GRAPH_TRACER
  	select HAVE_ARCH_KGDB
 +	select HAVE_HW_BREAKPOINT
 +	select PERF_EVENTS if HAVE_HW_BREAKPOINT
  	select ARCH_HIBERNATION_POSSIBLE if MMU
  
  config SUPERH64
@@@ -542,14 -540,16 +542,16 @@@ config SH_TIMER_MTU
  
  config SH_PCLK_FREQ
  	int "Peripheral clock frequency (in Hz)"
- 	default "27000000" if CPU_SUBTYPE_SH7343
+ 	depends on SH_CLK_CPG_LEGACY
  	default "31250000" if CPU_SUBTYPE_SH7619
- 	default "32000000" if CPU_SUBTYPE_SH7722
- 	default "33333333" if CPU_SUBTYPE_SH7770 || CPU_SUBTYPE_SH7723 || \
- 			      CPU_SUBTYPE_SH7760 || CPU_SUBTYPE_SH7705 || \
- 			      CPU_SUBTYPE_SH7203 || CPU_SUBTYPE_SH7206 || \
- 			      CPU_SUBTYPE_SH7263 || CPU_SUBTYPE_MXG    || \
- 			      CPU_SUBTYPE_SH7786 || CPU_SUBTYPE_SH7724
+ 	default "33333333" if CPU_SUBTYPE_SH7770 || \
+ 			      CPU_SUBTYPE_SH7760 || \
+ 			      CPU_SUBTYPE_SH7705 || \
+ 			      CPU_SUBTYPE_SH7203 || \
+ 			      CPU_SUBTYPE_SH7206 || \
+ 			      CPU_SUBTYPE_SH7263 || \
+ 			      CPU_SUBTYPE_MXG    || \
+ 			      CPU_SUBTYPE_SH7786
  	default "60000000" if CPU_SUBTYPE_SH7751 || CPU_SUBTYPE_SH7751R
  	default "66000000" if CPU_SUBTYPE_SH4_202
  	default "50000000"