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>
This commit is contained in:
Olof Johansson
2013-02-12 14:59:50 -08:00
8 changed files with 182 additions and 66 deletions

View File

@@ -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;