diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-03-11 06:43:32 +0100 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-03-11 06:43:32 +0100 |
| commit | a08572ae529b1e8de12393eeced661feae8fd44c (patch) | |
| tree | e9b48848ab72c953d778832336eb8e1d43abdc8d /arch/arm/mach-omap2/pm.c | |
| parent | Merge remote branch 'remotes/origin/hwmod_a_2.6.39' into tmp-integration-2.6.... (diff) | |
| parent | OMAP2+: voltage: reorganize, split code from data (diff) | |
| download | linux-a08572ae529b1e8de12393eeced661feae8fd44c.tar.xz linux-a08572ae529b1e8de12393eeced661feae8fd44c.zip | |
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/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 7bb64d8121a7..2c3a2531e678 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -18,8 +18,8 @@ #include <plat/omap-pm.h> #include <plat/omap_device.h> #include <plat/common.h> -#include <plat/voltage.h> +#include "voltage.h" #include "powerdomain.h" #include "clockdomain.h" #include "pm.h" |