diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-12 19:09:22 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-12 19:10:00 -0500 |
| commit | 4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch) | |
| tree | 59976175d70b6e08aacd4abf7090919d3b78fc29 /arch/arm/mach-omap2/omap-secure.c | |
| parent | 5c1af2a7011bf719807de360cb64c2f610269a38 (diff) | |
| parent | fb6842a7bc44bf719bfe85d5819a153d7c215510 (diff) | |
ARM: arm-soc: Merge branch 'next/clk' into next/pm
Merge together a couple of the smaller pm/clock branches into one.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/omap-secure.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-secure.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c index e089e4d1ae38..b970440cffca 100644 --- a/arch/arm/mach-omap2/omap-secure.c +++ b/arch/arm/mach-omap2/omap-secure.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <asm/cacheflush.h> | 18 | #include <asm/cacheflush.h> |
| 19 | #include <asm/memblock.h> | 19 | #include <asm/memblock.h> |
| 20 | 20 | ||
| 21 | #include <plat/omap-secure.h> | ||
| 22 | #include "omap-secure.h" | 21 | #include "omap-secure.h" |
| 23 | 22 | ||
| 24 | static phys_addr_t omap_secure_memblock_base; | 23 | static phys_addr_t omap_secure_memblock_base; |