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/clockdomain.h | |
| 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/clockdomain.h')
| -rw-r--r-- | arch/arm/mach-omap2/clockdomain.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h index 629576be7444..bc42446e23ab 100644 --- a/arch/arm/mach-omap2/clockdomain.h +++ b/arch/arm/mach-omap2/clockdomain.h | |||
| @@ -18,9 +18,8 @@ | |||
| 18 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
| 19 | 19 | ||
| 20 | #include "powerdomain.h" | 20 | #include "powerdomain.h" |
| 21 | #include <plat/clock.h> | 21 | #include "clock.h" |
| 22 | #include <plat/omap_hwmod.h> | 22 | #include "omap_hwmod.h" |
| 23 | #include <plat/cpu.h> | ||
| 24 | 23 | ||
| 25 | /* | 24 | /* |
| 26 | * Clockdomain flags | 25 | * Clockdomain flags |