diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:30:23 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:30:23 +0100 |
| commit | 2ecd9abf516e5e4afc482eb0329f9304aed285b4 (patch) | |
| tree | a2980c05f50df82d6d043e4e44ecaf2023220870 /drivers/media/video/samsung/mfc5x/mfc_dev.h | |
| parent | 698f3e8de2f0104dc80402ea151aae73b946a2d9 (diff) | |
| parent | a04b065c010280ed1806c73cb234a2bf657a5ce9 (diff) | |
| download | kernel_samsung_smdk4412-2ecd9abf516e5e4afc482eb0329f9304aed285b4.zip kernel_samsung_smdk4412-2ecd9abf516e5e4afc482eb0329f9304aed285b4.tar.gz kernel_samsung_smdk4412-2ecd9abf516e5e4afc482eb0329f9304aed285b4.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_kernel_samsung_smdk4412 into replicant-6.0
Diffstat (limited to 'drivers/media/video/samsung/mfc5x/mfc_dev.h')
| -rw-r--r-- | drivers/media/video/samsung/mfc5x/mfc_dev.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/samsung/mfc5x/mfc_dev.h b/drivers/media/video/samsung/mfc5x/mfc_dev.h index bb2095c..16bd027 100644 --- a/drivers/media/video/samsung/mfc5x/mfc_dev.h +++ b/drivers/media/video/samsung/mfc5x/mfc_dev.h @@ -114,6 +114,10 @@ struct mfc_dev { #if defined(CONFIG_BUSFREQ) atomic_t busfreq_lock_cnt; /* Bus frequency Lock count */ #endif +#if defined(CONFIG_MACH_GC1) && defined(CONFIG_EXYNOS4_CPUFREQ) + atomic_t cpufreq_lock_cnt; /* CPU frequency Lock count */ + int cpufreq_level; /* CPU frequency leve */ +#endif #if defined(CONFIG_CPU_EXYNOS4210) && defined(CONFIG_EXYNOS4_CPUFREQ) atomic_t cpufreq_lock_cnt; /* CPU frequency Lock count */ int cpufreq_level; /* CPU frequency leve */ |