diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-03-11 18:20:03 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-03-11 18:20:03 +0100 |
| commit | a2358a7bc35e388978fc2f7f6b071a0fd27d78c1 (patch) | |
| tree | fbdc2ddb066243a11aebc490c4d54e6a42be51e2 /arch/arm/mach-omap2/smartreflex.c | |
| parent | Merge branch 'for_2.6.39/pm-misc' of ssh://master.kernel.org/pub/scm/linux/ke... (diff) | |
| parent | Merge remote branch 'remotes/origin/voltage_split_2.6.39' into tmp-integratio... (diff) | |
| download | linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.tar.xz linux-a2358a7bc35e388978fc2f7f6b071a0fd27d78c1.zip | |
Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration into omap-for-linus
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex.c')
| -rw-r--r-- | arch/arm/mach-omap2/smartreflex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c index 0ab4dd5081ee..8f674c9442bf 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 |