Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
This commit is contained in:
commit
c8a79c3da1
|
@ -447,6 +447,7 @@ static __init int pxa_cpufreq_init(struct cpufreq_policy *policy)
|
|||
pxa27x_freq_table[i].frequency = freq;
|
||||
pxa27x_freq_table[i].index = i;
|
||||
}
|
||||
pxa27x_freq_table[i].index = i;
|
||||
pxa27x_freq_table[i].frequency = CPUFREQ_TABLE_END;
|
||||
|
||||
/*
|
||||
|
|
|
@ -102,7 +102,7 @@ static int setup_freqs_table(struct cpufreq_policy *policy,
|
|||
table[i].index = i;
|
||||
table[i].frequency = freqs[i].cpufreq_mhz * 1000;
|
||||
}
|
||||
table[num].frequency = i;
|
||||
table[num].index = i;
|
||||
table[num].frequency = CPUFREQ_TABLE_END;
|
||||
|
||||
pxa3xx_freqs = freqs;
|
||||
|
|
|
@ -802,10 +802,12 @@ static void __init spitz_init(void)
|
|||
{
|
||||
spitz_ficp_platform_data.gpio_pwdown = SPITZ_GPIO_IR_ON;
|
||||
|
||||
#ifdef CONFIG_MACH_BORZOI
|
||||
if (machine_is_borzoi()) {
|
||||
sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
|
||||
sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
|
||||
}
|
||||
#endif
|
||||
|
||||
platform_scoop_config = &spitz_pcmcia_config;
|
||||
|
||||
|
|
Loading…
Reference in a new issue