]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 13 Oct 2007 16:49:04 +0000 (09:49 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 13 Oct 2007 16:49:04 +0000 (09:49 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (124 commits)
  sh: allow building for both r2d boards in same binary.
  sh: fix r2d board detection
  sh: Discard .exit.text/.exit.data at runtime.
  sh: Fix up some section alignments in linker script.
  sh: Fix SH-4 DMAC CHCR masking.
  sh: Rip out left-over nommu cond syscall cruft.
  sh: Make kgdb i-cache flushing less inept.
  sh: kgdb section mismatches and tidying.
  sh: cleanup struct irqaction initializers.
  sh: early_printk tidying.
  video: pvr2fb: Add TV (RGB) support to Dreamcast PVR driver.
  sh: Conditionalize gUSA support.
  sh: Follow gUSA preempt changes in __switch_to().
  sh: Tidy up gUSA preempt handling.
  sh: __copy_user() optimizations for small copies.
  sh: clkfwk: Support multi-level clock propagation.
  sh: Fix URAM start address on SH7785.
  sh: Use boot_cpu_data for CPU probe.
  sh: Support extended mode TLB on SH-X3.
  sh: Bump MAX_ACTIVE_REGIONS for SH7785.
  ...

1  2 
arch/sh/kernel/cpufreq.c

diff --combined arch/sh/kernel/cpufreq.c
index 71d1c427b9079771ecf2528a02ddf0559aef2232,c7668971ba6c6a2a4f6446c620eec6334e8eab7a..e0590ffebd73f546af41b9a47453ab7eb09543ae
@@@ -77,8 -77,6 +77,6 @@@ static int sh_cpufreq_target(struct cpu
  
  static int sh_cpufreq_cpu_init(struct cpufreq_policy *policy)
  {
-       printk(KERN_INFO "cpufreq: SuperH CPU frequency driver.\n");
        if (!cpu_online(policy->cpu))
                return -ENODEV;
  
@@@ -93,6 -91,7 +91,6 @@@
        policy->cpuinfo.max_freq = (clk_round_rate(cpuclk, ~0UL) + 500) / 1000;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;
  
 -      policy->governor        = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cur             = sh_cpufreq_get(policy->cpu);
        policy->min             = policy->cpuinfo.min_freq;
        policy->max             = policy->cpuinfo.max_freq;
@@@ -143,6 -142,7 +141,7 @@@ static struct cpufreq_driver sh_cpufreq
  
  static int __init sh_cpufreq_module_init(void)
  {
+       printk(KERN_INFO "cpufreq: SuperH CPU frequency driver.\n");
        return cpufreq_register_driver(&sh_cpufreq_driver);
  }