aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/smartreflex.c
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-03-10 22:43:32 -0700
committerPaul Walmsley <paul@pwsan.com>2011-03-10 22:43:32 -0700
commita08572ae529b1e8de12393eeced661feae8fd44c (patch)
treee9b48848ab72c953d778832336eb8e1d43abdc8d /arch/arm/mach-omap2/smartreflex.c
parent2d403fe03070b541cc93cfa915f6e6c592cf231c (diff)
parentc0718df4d666cc5fd8837ac93c82995a17bfdbf5 (diff)
Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integration-2.6.39-20110310-024
Conflicts: arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex.c')
-rw-r--r--arch/arm/mach-omap2/smartreflex.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 95ac336fe3f..cf0bf5db47d 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -26,9 +26,9 @@
#include <linux/pm_runtime.h>
#include <plat/common.h>
-#include <plat/smartreflex.h>
#include "pm.h"
+#include "smartreflex.h"
#define SMARTREFLEX_NAME_LEN 16
#define NVALUE_NAME_LEN 40