Commit 57b501bd authored by Olof Johansson's avatar Olof Johansson

Merge branch 'v3.4-cpufreq-exynos-fixes' of...

Merge branch 'v3.4-cpufreq-exynos-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.4-cpufreq-exynos-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  EXYNOS: fix dependency for EXYNOS_CPUFREQ
parents ff140865 2d1f6310
...@@ -51,9 +51,6 @@ config ARM_S5PV210_CPUFREQ ...@@ -51,9 +51,6 @@ config ARM_S5PV210_CPUFREQ
config ARM_EXYNOS_CPUFREQ config ARM_EXYNOS_CPUFREQ
bool "SAMSUNG EXYNOS SoCs" bool "SAMSUNG EXYNOS SoCs"
depends on ARCH_EXYNOS depends on ARCH_EXYNOS
select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210
select ARM_EXYNOS4X12_CPUFREQ if (SOC_EXYNOS4212 || SOC_EXYNOS4412)
select ARM_EXYNOS5250_CPUFREQ if SOC_EXYNOS5250
default y default y
help help
This adds the CPUFreq driver common part for Samsung This adds the CPUFreq driver common part for Samsung
...@@ -62,20 +59,19 @@ config ARM_EXYNOS_CPUFREQ ...@@ -62,20 +59,19 @@ config ARM_EXYNOS_CPUFREQ
If in doubt, say N. If in doubt, say N.
config ARM_EXYNOS4210_CPUFREQ config ARM_EXYNOS4210_CPUFREQ
bool "Samsung EXYNOS4210" def_bool CPU_EXYNOS4210
depends on ARCH_EXYNOS
help help
This adds the CPUFreq driver for Samsung EXYNOS4210 This adds the CPUFreq driver for Samsung EXYNOS4210
SoC (S5PV310 or S5PC210). SoC (S5PV310 or S5PC210).
config ARM_EXYNOS4X12_CPUFREQ config ARM_EXYNOS4X12_CPUFREQ
bool "Samsung EXYNOS4X12" def_bool (SOC_EXYNOS4212 || SOC_EXYNOS4412)
help help
This adds the CPUFreq driver for Samsung EXYNOS4X12 This adds the CPUFreq driver for Samsung EXYNOS4X12
SoC (EXYNOS4212 or EXYNOS4412). SoC (EXYNOS4212 or EXYNOS4412).
config ARM_EXYNOS5250_CPUFREQ config ARM_EXYNOS5250_CPUFREQ
bool "Samsung EXYNOS5250" def_bool SOC_EXYNOS5250
help help
This adds the CPUFreq driver for Samsung EXYNOS5250 This adds the CPUFreq driver for Samsung EXYNOS5250
SoC. SoC.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment