diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2014-12-18 22:54:03 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-03-11 01:10:03 +0100 |
| commit | ceeef7af42c5f91d1613bc9a63cf05a702dbdd0d (patch) | |
| tree | c64438d7a2afd39d49f31792520b3db5a7cc5cb2 /arch | |
| parent | c759a52251a0cb25b1d2460b53b22ae81dd172d4 (diff) | |
| download | kernel_samsung_tuna-ceeef7af42c5f91d1613bc9a63cf05a702dbdd0d.zip kernel_samsung_tuna-ceeef7af42c5f91d1613bc9a63cf05a702dbdd0d.tar.gz kernel_samsung_tuna-ceeef7af42c5f91d1613bc9a63cf05a702dbdd0d.tar.bz2 | |
omap: Fix warning when OMAP errata options are disabled.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/include/mach/omap4-common.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h index a8f7501..0fc4cf6 100644 --- a/arch/arm/mach-omap2/include/mach/omap4-common.h +++ b/arch/arm/mach-omap2/include/mach/omap4-common.h @@ -171,6 +171,12 @@ extern u32 omap_get_arm_rev(void); */ static inline unsigned int omap4_get_diagctrl0_errata_flags(void) { +/* If we don't have any erratas enabled, return 0 right away */ +#if !defined(CONFIG_OMAP4_ARM_ERRATA_742230) && \ + !defined(CONFIG_OMAP4_ARM_ERRATA_751472) && \ + !defined(CONFIG_OMAP4_ARM_ERRATA_743622) + return 0; +#else unsigned int ret = 0; u32 arm_rev = omap_get_arm_rev(); #ifdef CONFIG_OMAP4_ARM_ERRATA_742230 @@ -186,6 +192,7 @@ static inline unsigned int omap4_get_diagctrl0_errata_flags(void) ret |= (1 << 6); #endif return ret; +#endif } extern int omap4_prcm_freq_update(void); |