Commit 08ceca8e authored Dec 31, 2015 by Arnd Bergmann

Merge tag 'omap-for-v4.5/81xx-fix-signed' of...

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

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

parents 1f33b013 dbb7e70a

arch/arm/mach-omap2/prm_common.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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,

Admin message