diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-22 17:11:06 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-11-22 17:11:06 +0000 |
| commit | c8a79c3da1ee5dcdbf6db829554fe3d9e68a88ab (patch) | |
| tree | d82bfd71ad57f826cf455422a9f88743373f9bcc /arch/arm | |
| parent | f8d5e5a8f5be475796c7f357e43546c2d7f44540 (diff) | |
| parent | 81065518eda14ebbce1b48c98d5077b0a059d4a3 (diff) | |
| download | op-kernel-dev-c8a79c3da1ee5dcdbf6db829554fe3d9e68a88ab.zip op-kernel-dev-c8a79c3da1ee5dcdbf6db829554fe3d9e68a88ab.tar.gz | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-pxa/cpufreq-pxa2xx.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/cpufreq-pxa3xx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/spitz.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cpufreq-pxa2xx.c b/arch/arm/mach-pxa/cpufreq-pxa2xx.c index 983cc8c..9e4d981 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa2xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa2xx.c @@ -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; /* diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c index 67f34a8..149cdd9 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c @@ -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; diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 3da45d0..d98023f 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c @@ -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; |
