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
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 55acc76..5b2f513 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -662,7 +662,9 @@
.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,