diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-03-06 16:32:47 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-03-06 16:32:47 -0500 |
| commit | 00fd72ccc928c1fefc4c9c3b925f82cb71750dfb (patch) | |
| tree | fb77d8bad2e21597ed5d0b34fdd040044999e2c2 /arch/arm/mach-omap1/clock.c | |
| parent | 9cf793f9b8b1ba9414e2a7591b2e911885f85a27 (diff) | |
| parent | 1416408d31236dc2a80d269aa23ffa93aa01e833 (diff) | |
Merge branch 'for_3.4/cleanup/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into cleanup-pm
Diffstat (limited to 'arch/arm/mach-omap1/clock.c')
| -rw-r--r-- | arch/arm/mach-omap1/clock.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c index 0c50df05d13..67382ddd8c8 100644 --- a/arch/arm/mach-omap1/clock.c +++ b/arch/arm/mach-omap1/clock.c | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/clk.h> | ||
| 19 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/clk.h> | ||
| 20 | #include <linux/clkdev.h> | 20 | #include <linux/clkdev.h> |
| 21 | 21 | ||
| 22 | #include <asm/mach-types.h> | 22 | #include <asm/mach-types.h> |
| @@ -27,6 +27,9 @@ | |||
| 27 | #include <plat/sram.h> | 27 | #include <plat/sram.h> |
| 28 | #include <plat/clkdev_omap.h> | 28 | #include <plat/clkdev_omap.h> |
| 29 | 29 | ||
| 30 | #include <mach/hardware.h> | ||
| 31 | |||
| 32 | #include "iomap.h" | ||
| 30 | #include "clock.h" | 33 | #include "clock.h" |
| 31 | #include "opp.h" | 34 | #include "opp.h" |
| 32 | 35 | ||