diff options
| author | Tony Lindgren | 2012-06-04 11:41:19 +0200 |
|---|---|---|
| committer | Tony Lindgren | 2012-06-04 11:41:19 +0200 |
| commit | ded884c2d7f627f4f5456bbeb9d174decc3e7261 (patch) | |
| tree | 314ef5faff6f061e70ed2be6050a40205765ffd1 /arch/arm/mach-omap2 | |
| parent | Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | ARM: OMAP: SoC detection: remove unused cpu_is macros (diff) | |
| download | kernel-qcow2-linux-ded884c2d7f627f4f5456bbeb9d174decc3e7261.tar.gz kernel-qcow2-linux-ded884c2d7f627f4f5456bbeb9d174decc3e7261.tar.xz kernel-qcow2-linux-ded884c2d7f627f4f5456bbeb9d174decc3e7261.zip | |
Merge branch 'for_3.5/cleanup/am3xxx-cpu-is-leftovers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/clock3xxx_data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c index 4e1a3b0e8cc8..1efdec236ae8 100644 --- a/arch/arm/mach-omap2/clock3xxx_data.c +++ b/arch/arm/mach-omap2/clock3xxx_data.c @@ -3514,7 +3514,7 @@ int __init omap3xxx_clk_init(void) struct omap_clk *c; u32 cpu_clkflg = 0; - if (cpu_is_omap3517()) { + if (soc_is_am35xx()) { cpu_mask = RATE_IN_34XX; cpu_clkflg = CK_AM35XX; } else if (cpu_is_omap3630()) { |