diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-04-30 10:08:29 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-04-30 10:08:29 -0700 |
| commit | a8822e2d570bc265c9fa0347710fbcc7bef8b327 (patch) | |
| tree | 4a5b198d5ab6bdde620f9dbe8282a10604a204a4 /arch/arm/mach-omap2/vc3xxx_data.c | |
| parent | 69964ea4c7b68c9399f7977aa5b9aa6539a6a98a (diff) | |
| parent | 39358f2b57f37fe079eff4159307c844a0bfb176 (diff) | |
Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into pm-regulatoromap-pm-regulator-for-v3.5
Conflicts:
arch/arm/mach-omap2/twl-common.c
Diffstat (limited to 'arch/arm/mach-omap2/vc3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/vc3xxx_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/vc3xxx_data.c b/arch/arm/mach-omap2/vc3xxx_data.c index a5ec7f8f2ea8..5d8eaf31569c 100644 --- a/arch/arm/mach-omap2/vc3xxx_data.c +++ b/arch/arm/mach-omap2/vc3xxx_data.c @@ -46,6 +46,7 @@ static struct omap_vc_common omap3_vc_common = { }; struct omap_vc_channel omap3_vc_mpu = { + .flags = OMAP_VC_CHANNEL_DEFAULT, .common = &omap3_vc_common, .smps_sa_reg = OMAP3_PRM_VC_SMPS_SA_OFFSET, .smps_volra_reg = OMAP3_PRM_VC_SMPS_VOL_RA_OFFSET, |