diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-10-26 13:32:22 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-10-26 13:32:22 -0700 |
| commit | 7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33 (patch) | |
| tree | e696fcf3eb3b9c6311fc4fa51aa8c89a29aad9c2 /arch/arm/mach-omap1 | |
| parent | 8634155ef41d3a035f2ea0b6c5bed2806f2788bc (diff) | |
| parent | a0212796b58061a9716178d261f318925c246643 (diff) | |
| download | op-kernel-dev-7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33.zip op-kernel-dev-7fc54fd3084457c7f11b9e2e1e3fcd19a3badc33.tar.gz | |
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.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/pm_bus.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 4ec220d..d940fac 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 16bf2f9..3f2d396 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) { |
