diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 22:32:00 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-22 22:32:00 +0400 |
| commit | 3384fb98845dc014770caa224d61a2effd258ca5 (patch) | |
| tree | 8189134a4938632e2d06e93af04c9fc1f3c2d4c9 /arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | |
| parent | 8cfc545e0e3e6cc82acfdc79321b41eeeab0ca45 (diff) | |
| parent | ade7515fefad9af13f6dd469f35bb413b6a5b473 (diff) | |
| download | linux-3384fb98845dc014770caa224d61a2effd258ca5.tar.xz | |
Merge branch 'regulator-drivers' into regulator-next
Diffstat (limited to 'arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c b/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c index 839145e1cfbe..4972219653ce 100644 --- a/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c +++ b/arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c @@ -88,4 +88,5 @@ struct clockdomain wkup_common_clkdm = { .name = "wkup_clkdm", .pwrdm = { .name = "wkup_pwrdm" }, .dep_bit = OMAP_EN_WKUP_SHIFT, + .flags = CLKDM_ACTIVE_WITH_MPU, }; |