summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/pm_bus.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2011-11-29 09:51:07 (GMT)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-11-29 09:51:07 (GMT)
commit0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4 (patch)
treed2ca69347816c27f9dc352581f5d0fe76811cd49 /arch/arm/mach-omap1/pm_bus.c
parent3d95fd6ad8d3cf582a70ed65660017114b6e4065 (diff)
parentcaca6a03d365883564885f2c1da3e88dcf65d139 (diff)
downloadlinux-fsl-qoriq-0d2cd91bf7b1a7cc1d638296111fcc2bcf5c0bb4.tar.xz
Merge commit 'v3.2-rc3' into next
Diffstat (limited to 'arch/arm/mach-omap1/pm_bus.c')
-rw-r--r--arch/arm/mach-omap1/pm_bus.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/pm_bus.c b/arch/arm/mach-omap1/pm_bus.c
index 943072d..7868e75 100644
--- a/arch/arm/mach-omap1/pm_bus.c
+++ b/arch/arm/mach-omap1/pm_bus.c
@@ -13,6 +13,7 @@
#include <linux/kernel.h>
#include <linux/io.h>
#include <linux/pm_runtime.h>
+#include <linux/pm_clock.h>
#include <linux/platform_device.h>
#include <linux/mutex.h>
#include <linux/clk.h>