diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 16:18:51 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-31 16:18:51 +0100 |
| commit | 08ceca8ea629828e4cb922c121b5c87681c97fb7 (patch) | |
| tree | 77a8e277e600b60033da2e41efd6763685f40488 | |
| parent | 1f33b0131a15f4dc6b2fff9d3ef9d002070bda40 (diff) | |
| parent | dbb7e70a69288980c8a89fdb5ffb97e06b806b19 (diff) | |
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
| -rw-r--r-- | arch/arm/mach-omap2/prm_common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c index 55acc76113b8..5b2f5138d938 100644 --- a/arch/arm/mach-omap2/prm_common.c +++ b/arch/arm/mach-omap2/prm_common.c @@ -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, |