someOS/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'omap-for-v4.5/81xx-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Browse Source 
Merge "reworked fix for earlier ti81xx changes for v4.5 merge window" from Tony Lindgren:

Fix a randconfig build warning introduced in the earlier branch
omap-for-v4.5/81xx-fixes-signed.

* tag 'omap-for-v4.5/81xx-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix randconfig build warning for dm814_pllss_data
This commit is contained in:
Arnd Bergmann
2015-12-31 16:18:51 +01:00
parent 1f33b0131a dbb7e70a69
commit 08ceca8ea6
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/prm_common.c
View File

@@ -662,7 +662,9 @@ static struct omap_prcm_init_data am3_prm_data __initdata = {
.index = TI_CLKM_PRM,
.init = am33xx_prm_init,
};
#endif
#ifdef CONFIG_SOC_TI81XX
static struct omap_prcm_init_data dm814_pllss_data __initdata = {
.index = TI_CLKM_PLLSS,
.init = am33xx_prm_init,