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/smartreflex.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/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 95ac336fe3f7..cf0bf5db47dd 100644 --- a/arch/arm/mach-omap2/smartreflex.c +++ b/arch/arm/mach-omap2/smartreflex.c | |||
| @@ -26,9 +26,9 @@ | |||
| 26 | #include <linux/pm_runtime.h> | 26 | #include <linux/pm_runtime.h> |
| 27 | 27 | ||
| 28 | #include <plat/common.h> | 28 | #include <plat/common.h> |
| 29 | #include <plat/smartreflex.h> | ||
| 30 | 29 | ||
| 31 | #include "pm.h" | 30 | #include "pm.h" |
| 31 | #include "smartreflex.h" | ||
| 32 | 32 | ||
| 33 | #define SMARTREFLEX_NAME_LEN 16 | 33 | #define SMARTREFLEX_NAME_LEN 16 |
| 34 | #define NVALUE_NAME_LEN 40 | 34 | #define NVALUE_NAME_LEN 40 |