diff options
author | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 07:52:14 +0300 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2015-06-11 07:52:14 +0300 |
commit | 111b23cf895b5cbcdc1b2c6580be1bb78a577d05 (patch) | |
tree | 89b840115ccd753216ba0b26e587e52699b99310 /drivers/thermal/samsung/exynos_tmu.h | |
parent | 6a6bcf08e5d1834447655a762dfaf552b675cc54 (diff) | |
parent | 53daf9383f34d7bf61358a37449fb4d59fbdafc2 (diff) | |
download | linux-111b23cf895b5cbcdc1b2c6580be1bb78a577d05.tar.xz |
Merge branches 'release' and 'thermal-soc' of .git into next
Diffstat (limited to 'drivers/thermal/samsung/exynos_tmu.h')
-rw-r--r-- | drivers/thermal/samsung/exynos_tmu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h index 4d71ec6c9aa0..440c7140b660 100644 --- a/drivers/thermal/samsung/exynos_tmu.h +++ b/drivers/thermal/samsung/exynos_tmu.h @@ -33,6 +33,7 @@ enum soc_type { SOC_ARCH_EXYNOS5260, SOC_ARCH_EXYNOS5420, SOC_ARCH_EXYNOS5420_TRIMINFO, + SOC_ARCH_EXYNOS5433, SOC_ARCH_EXYNOS5440, SOC_ARCH_EXYNOS7, }; |