diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-26 06:55:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-26 06:55:23 -0700 |
| commit | 9e74f218abd04dfa082391672295ecc1a3654845 (patch) | |
| tree | d668104b1021bcc737b5fadc7992f45a4c638705 /arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |
| parent | b955eefc46a6923424cbede2f8ab76c8f5acf056 (diff) | |
| parent | 21ff63ad131218048525fbd37d065ce61f03bcbd (diff) | |
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index f30e861ce6d..6b564c9c2ce 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -19,6 +19,7 @@ */ #include <linux/io.h> +#include <linux/power/smartreflex.h> #include <plat/omap_hwmod.h> #include <plat/cpu.h> @@ -32,8 +33,6 @@ #include <plat/common.h> #include "omap_hwmod_common_data.h" - -#include "smartreflex.h" #include "cm1_44xx.h" #include "cm2_44xx.h" #include "prm44xx.h" |