Merge branch 'linus' into core/rodata

[linux-2.6-omap-h63xx.git] / arch / arm / mach-sa1100 / cpu-sa1110.c

diff --git a/arch/arm/mach-sa1100/cpu-sa1110.c b/arch/arm/mach-sa1100/cpu-sa1110.c
index 90a4130114a61dcc555139359a3848e1d845f288..36b47ff5af11ddf5dccadba8170baee881a2d133 100644 (file)
--- a/arch/arm/mach-sa1100/cpu-sa1110.c
+++ b/arch/arm/mach-sa1100/cpu-sa1110.c
@@ -83,7 +83,7 @@ static struct sdram_params sdram_tbl[] __initdata = {
                .refresh        = 64000,
                .cas_latency    = 3,
        }, {    /* Samsung K4S281632B-1H */
-               .name           = "K4S281632b-1H",
+               .name           = "K4S281632B-1H",
                .rows           = 12,
                .tck            = 10,
                .trp            = 20,
@@ -331,7 +331,6 @@ static int __init sa1110_cpu_init(struct cpufreq_policy *policy)
        if (policy->cpu != 0)
                return -EINVAL;
        policy->cur = policy->min = policy->max = sa11x0_getspeed(0);
-       policy->governor = CPUFREQ_DEFAULT_GOVERNOR;
        policy->cpuinfo.min_freq = 59000;
        policy->cpuinfo.max_freq = 287000;
        policy->cpuinfo.transition_latency = CPUFREQ_ETERNAL;