diff options
author | Tony Lindgren <tony@atomide.com> | 2012-06-28 05:47:01 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 05:47:01 -0700 |
commit | 472fd5401561f94698f4c8f9dbbbfbf76ab55626 (patch) | |
tree | 2b026da522975ca03bfcdd80b66bb266ed6553a9 /arch/arm/mach-omap2/clockdomains2420_data.c | |
parent | 5f6129675bf17aeda5385830c446b91899cb6812 (diff) | |
parent | 19f3a98d82cabdff5a1a437811d472ef52f34954 (diff) |
Merge branch 'cleanup-hwmod' into cleanupomap-cleanup-for-v3.6
Conflicts:
arch/arm/mach-omap2/dsp.c
Diffstat (limited to 'arch/arm/mach-omap2/clockdomains2420_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clockdomains2420_data.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clockdomains2420_data.c b/arch/arm/mach-omap2/clockdomains2420_data.c index 0ab8e46d5b2b..5c741852fac0 100644 --- a/arch/arm/mach-omap2/clockdomains2420_data.c +++ b/arch/arm/mach-omap2/clockdomains2420_data.c @@ -131,8 +131,6 @@ static struct clockdomain dss_2420_clkdm = { static struct clockdomain *clockdomains_omap242x[] __initdata = { &wkup_common_clkdm, - &cm_common_clkdm, - &prm_common_clkdm, &mpu_2420_clkdm, &iva1_2420_clkdm, &dsp_2420_clkdm, |