diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-07 14:05:29 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-07 14:05:29 -0800 |
| commit | 4d02be5a6550ebf09936802c2cb8d359ce1ab29c (patch) | |
| tree | 11845186f62a45a3809c477ea28daba8d94e0392 /arch/arm | |
| parent | 18bb4fb28760b3d23355f6e3cc3cbe1a07321c0a (diff) | |
| parent | 2b43e4e5863fb41d85c3a6583fdeea2ebf3d2b50 (diff) | |
Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Fix build error after merge
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/cm2xxx_3xxx.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/common.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/sdrc2xxx.c | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx.c b/arch/arm/mach-omap2/cm2xxx_3xxx.c index c79ed63601c..389f9f8b570 100644 --- a/arch/arm/mach-omap2/cm2xxx_3xxx.c +++ b/arch/arm/mach-omap2/cm2xxx_3xxx.c @@ -18,6 +18,8 @@ #include <linux/err.h> #include <linux/io.h> +#include <plat/hardware.h> + #include "iomap.h" #include "common.h" #include "cm.h" diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 93419de4534..1549c11000d 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -17,6 +17,7 @@ #include <linux/clk.h> #include <linux/io.h> +#include <plat/hardware.h> #include <plat/board.h> #include <plat/mux.h> #include <plat/clock.h> diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 2fd5fd1abb4..08e674bb041 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -15,6 +15,7 @@ #include <linux/kernel.h> #include <linux/io.h> +#include <plat/hardware.h> #include <plat/sdrc.h> #include "iomap.h" diff --git a/arch/arm/mach-omap2/sdrc2xxx.c b/arch/arm/mach-omap2/sdrc2xxx.c index 2c329a6f477..1133bb2f632 100644 --- a/arch/arm/mach-omap2/sdrc2xxx.c +++ b/arch/arm/mach-omap2/sdrc2xxx.c @@ -24,6 +24,7 @@ #include <linux/clk.h> #include <linux/io.h> +#include <plat/hardware.h> #include <plat/clock.h> #include <plat/sram.h> #include <plat/sdrc.h> |