summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/mux.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-12-12 16:09:22 -0800
committerOlof Johansson <olof@lixom.net>2012-12-12 16:10:00 -0800
commit4a76411ea3f1da9032e031f8fff8894b97d141b2 (patch)
tree59976175d70b6e08aacd4abf7090919d3b78fc29 /arch/arm/mach-omap2/mux.c
parent5c1af2a7011bf719807de360cb64c2f610269a38 (diff)
parentfb6842a7bc44bf719bfe85d5819a153d7c215510 (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/mux.c')
-rw-r--r--arch/arm/mach-omap2/mux.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 701e17cba46..26126343d6a 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -36,8 +36,9 @@
#include <linux/interrupt.h>
-#include <plat/omap_hwmod.h>
+#include "omap_hwmod.h"
+#include "soc.h"
#include "control.h"
#include "mux.h"
#include "prm.h"