forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '31d9adca82' into tmp

Browse source 
Conflicts:
	arch/arm/plat-omap/dmtimer.c
This commit is contained in:
Jon Hunter 2013-04-01 14:33:50 -05:00
commit dca3a78340
10415 changed files with 537244 additions and 276375 deletions
Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-omap2/gpmc-onenand.c
View file

@ -356,7 +356,7 @@ static int gpmc_onenand_setup(void __iomem *onenand_base, int *freq_ptr)
return ret;
}
void __init gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
void gpmc_onenand_init(struct omap_onenand_platform_data *_onenand_data)
{
int err;