diff options
| author | Olof Johansson <olof@lixom.net> | 2013-12-29 00:12:07 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-12-29 00:12:07 +0100 |
| commit | 6eb5c9db7a362503e6c5ebada6b898409cca4ce1 (patch) | |
| tree | 562fcd79dc7baa632f01885e52cdccb35c3a4e7c /drivers/cpufreq/exynos4x12-cpufreq.c | |
| parent | Merge tag 'tegra-for-3.14-dmas-resets-rework' of git://git.kernel.org/pub/scm... (diff) | |
| parent | ARM: EXYNOS: Kill exynos_pm_late_initcall() (diff) | |
| download | linux-6eb5c9db7a362503e6c5ebada6b898409cca4ce1.tar.xz linux-6eb5c9db7a362503e6c5ebada6b898409cca4ce1.zip | |
Merge tag 'samsung-cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
From Kukjin Kim:
Samsung cleanup 2nd for v3.14
- remove <mach/regs-clock.h> for exynos
- remove <mach/regs-irq.h> for exynos
- local <mach/regs-pmu.h> into mach-exynos
- select PM_GENERIC_DOMAINS for ARCH_EXYNOS4
instead of each SOC_EXYNOS4XXX in Kconfig
- call pm_genpd_poweroff_unused() instead of via
exynos_pm_late_initcall() because no need to
handle whether CONFIG_PM_GENERIC_DOMAINS is enalbed
* tag 'samsung-cleanup-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Kill exynos_pm_late_initcall()
ARM: EXYNOS: Consolidate selection of PM_GENERIC_DOMAINS for Exynos4
PM / devfreq: use inclusion <mach/map.h> instead of <plat/map-s5p.h>
ARM: EXYNOS: remove <mach/regs-clock.h> for exynos
ARM: EXYNOS: local definitions for cpuidle.c into mach-exynos dir
cpufreq: exynos: move definitions for exynos-cpufreq into drivers/cpufreq/
ARM: EXYNOS: local definitions for pm.c into mach-exynos dir
PM / devfreq: move definitions for exynos4_bus into drivers/devfreq
ARM: EXYNOS: cleanup <mach/regs-clock.h>
ARM: EXYNOS: cleanup <mach/regs-irq.h>
ARM: EXYNOS: local regs-pmu.h header file
ARM: EXYNOS: remove inclusion <mach/regs-pmu.h> into another headers
ARM: EXYNOS: cleanup <mach/regs-pmu.h>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/cpufreq/exynos4x12-cpufreq.c')
| -rw-r--r-- | drivers/cpufreq/exynos4x12-cpufreq.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c b/drivers/cpufreq/exynos4x12-cpufreq.c index efad5e657f6f..869e48297e28 100644 --- a/drivers/cpufreq/exynos4x12-cpufreq.c +++ b/drivers/cpufreq/exynos4x12-cpufreq.c @@ -17,8 +17,6 @@ #include <linux/slab.h> #include <linux/cpufreq.h> -#include <mach/regs-clock.h> - #include "exynos-cpufreq.h" static struct clk *cpu_clk; |