diff options
author | Olof Johansson <olof@lixom.net> | 2013-02-12 23:59:50 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-02-13 00:00:14 +0100 |
commit | b22d18c3b412f1a8877c59f043a0a8334d19d50c (patch) | |
tree | a8c041c84eaa78b5fd804b06ec0123d961174609 /drivers/cpufreq | |
parent | ARM: exynos: move exynos4210-combiner to drivers/irqchip (diff) | |
parent | mfd: db8500-prcmu: update resource passing (diff) | |
download | linux-b22d18c3b412f1a8877c59f043a0a8334d19d50c.tar.xz linux-b22d18c3b412f1a8877c59f043a0a8334d19d50c.zip |
Merge tag 'for-arm-soc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/cleanup
From Linus Walleij:
Two fixes for broken <mach/id.h> cleanup.
* tag 'for-arm-soc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
mfd: db8500-prcmu: update resource passing
drivers/db8500-cpufreq: delete dangling include
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/cpufreq')
-rw-r--r-- | drivers/cpufreq/db8500-cpufreq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/cpufreq/db8500-cpufreq.c b/drivers/cpufreq/db8500-cpufreq.c index 523c9403bfce..87130e219505 100644 --- a/drivers/cpufreq/db8500-cpufreq.c +++ b/drivers/cpufreq/db8500-cpufreq.c @@ -15,7 +15,6 @@ #include <linux/slab.h> #include <linux/platform_device.h> #include <linux/clk.h> -#include <mach/id.h> static struct cpufreq_frequency_table *freq_table; static struct clk *armss_clk; |