diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-05 10:28:38 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-05 10:28:38 -0800 |
| commit | 9237b5aa447dce55913b61f435c5140410bf5310 (patch) | |
| tree | e107fbd74e98b301bfb8c964443c6c86a0f609a3 /arch/arm/mach-omap1 | |
| parent | 6c97a189592fadaa928aa3e6c673e061823f1597 (diff) | |
| parent | a0212796b58061a9716178d261f318925c246643 (diff) | |
| download | talos-op-linux-9237b5aa447dce55913b61f435c5140410bf5310.tar.gz talos-op-linux-9237b5aa447dce55913b61f435c5140410bf5310.zip | |
Merge tag 'omap-for-v3.8/cleanup-headers-part3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/headers
From Tony Lindgren:
Here is the third set of plat header removal for omap2+.
This is based on the following minimal topic branches
coordinated with the related driver maintainers:
omap-for-v3.8/cleanup-headers-usb
omap-for-v3.8/cleanup-headers-menelaus
In addition to that, there are few fixes to the previously
merged patches that can show up with customized configs.
* tag 'omap-for-v3.8/cleanup-headers-part3-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP1: fix sparse warning added by commit 4c98dc6b8ef2f73bdbfa78186db9a76507ba9ea3
ARM: OMAP1: fix build breakage introduced by commit 25c7d49ed48b4843da7dea56a81ae7f620211ee0
ARM: OMAP2+: fix build breakage introduced by commit b7754452b3e27716347a528b47b0a1083af32520
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 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) { |
