diff options
| author | Paul Walmsley <paul@pwsan.com> | 2011-03-11 00:43:32 -0500 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2011-03-11 00:43:32 -0500 |
| commit | a08572ae529b1e8de12393eeced661feae8fd44c (patch) | |
| tree | e9b48848ab72c953d778832336eb8e1d43abdc8d /arch/arm/mach-omap2/pm.c | |
| parent | 2d403fe03070b541cc93cfa915f6e6c592cf231c (diff) | |
| parent | c0718df4d666cc5fd8837ac93c82995a17bfdbf5 (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/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 @@ | |||
| 18 | #include <plat/omap-pm.h> | 18 | #include <plat/omap-pm.h> |
| 19 | #include <plat/omap_device.h> | 19 | #include <plat/omap_device.h> |
| 20 | #include <plat/common.h> | 20 | #include <plat/common.h> |
| 21 | #include <plat/voltage.h> | ||
| 22 | 21 | ||
| 22 | #include "voltage.h" | ||
| 23 | #include "powerdomain.h" | 23 | #include "powerdomain.h" |
| 24 | #include "clockdomain.h" | 24 | #include "clockdomain.h" |
| 25 | #include "pm.h" | 25 | #include "pm.h" |