summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/pm.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2012-09-27 18:33:34 +0200
committerTony Lindgren <tony@atomide.com>2012-10-19 01:23:20 +0200
commita135eaae524acba1509a3b19c97fae556e4da7cd (patch)
tree275d3c326c45152e7c8fc24d79db5ff3b9f8f338 /arch/arm/mach-omap1/pm.c
parentARM: OMAP: duplicate plat-omap/clock.c into mach-omap[12]/clock.c (diff)
downloadlinux-a135eaae524acba1509a3b19c97fae556e4da7cd.tar.xz
linux-a135eaae524acba1509a3b19c97fae556e4da7cd.zip
ARM: OMAP: remove plat/clock.h
Remove arch/arm/plat-omap/include/plat/clock.h by merging it into arch/arm/mach-omap1/clock.h and arch/arm/mach-omap2/clock.h. The goal here is to facilitate ARM single image kernels by removing includes via the "plat/" symlink. Signed-off-by: Paul Walmsley <paul@pwsan.com> [tony@atomide.com: fixed to remove duplicate clock.h includes] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
-rw-r--r--arch/arm/mach-omap1/pm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index fa8e672a26c5..b2c2328d7c18 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -49,8 +49,6 @@
#include <asm/mach/time.h>
#include <asm/mach/irq.h>
-#include <plat/cpu.h>
-#include <plat/clock.h>
#include <mach/tc.h>
#include <mach/mux.h>
#include <plat-omap/dma-omap.h>
@@ -61,6 +59,7 @@
#include "../plat-omap/sram.h"
#include "iomap.h"
+#include "clock.h"
#include "pm.h"
static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];