summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2012-10-26 22:32:22 +0200
committerTony Lindgren <tony@atomide.com>2012-10-26 22:32:22 +0200
commit7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33 (patch)
treee696fcf3eb3b9c6311fc4fa51aa8c89a29aad9c2 /arch/arm/mach-omap1
parentMerge tag 'omap-cleanup-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentMerge tag 'omap-cleanup-fixes-a-for-3.8' of git://git.kernel.org/pub/scm/linu... (diff)
downloadlinux-7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33.tar.xz
linux-7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33.zip
Merge branch 'omap-for-v3.8/cleanup-headers' into omap-for-v3.8/cleanup-prcm
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/fpga.c1
-rw-r--r--arch/arm/mach-omap1/pm_bus.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index 4ec220d8da5c..d940fac9a9ed 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -32,6 +32,7 @@
#include <mach/hardware.h>
#include "iomap.h"
+#include "common.h"
static void fpga_mask_irq(struct irq_data *d)
{
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 16bf2f95117c..3f2d39672393 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -19,6 +19,8 @@
#include <linux/clk.h>
#include <linux/err.h>
+#include "soc.h"
+
#ifdef CONFIG_PM_RUNTIME
static int omap1_pm_runtime_suspend(struct device *dev)
{