Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8a79c3d authored by Russell King's avatar Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents f8d5e5a8 81065518

arch/arm/mach-pxa/cpufreq-pxa2xx.c

+1 −0
Original line number Diff line number Diff line
@@ -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;



	/*

arch/arm/mach-pxa/cpufreq-pxa3xx.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/arm/mach-pxa/spitz.c

+2 −0
Original line number Diff line number Diff line
@@ -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;