diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-12 17:59:50 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-12 18:00:14 -0500 |
| commit | b22d18c3b412f1a8877c59f043a0a8334d19d50c (patch) | |
| tree | a8c041c84eaa78b5fd804b06ec0123d961174609 /drivers/cpufreq | |
| parent | a900e5d9971860f2c400ed84d529c891fcd9a3b2 (diff) | |
| parent | 05ec260edecaf3dc214cff49d43b1ad9b2cbb710 (diff) | |
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 @@ | |||
| 15 | #include <linux/slab.h> | 15 | #include <linux/slab.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 18 | #include <mach/id.h> | ||
| 19 | 18 | ||
| 20 | static struct cpufreq_frequency_table *freq_table; | 19 | static struct cpufreq_frequency_table *freq_table; |
| 21 | static struct clk *armss_clk; | 20 | static struct clk *armss_clk; |