diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-09-27 22:17:13 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-09-27 22:17:13 +0200 |
| commit | 91f6c90c8df1818a66d177e105d602c3da820919 (patch) | |
| tree | 5cb1b01823dd676a07596f6153d2fc124c4691cb /arch/arm/mach-omap2/id.c | |
| parent | update OMAP Kconfig help texts for all supported SoC models (diff) | |
| parent | omap3: Prevent SDRC deadlock when L3 is changing frequency (diff) | |
| download | linux-91f6c90c8df1818a66d177e105d602c3da820919.tar.xz linux-91f6c90c8df1818a66d177e105d602c3da820919.zip | |
Merge branch 'omap4_and_sdrc_2.6.27' of git://git.pwsan.com/linux-2.6 into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 91d7df402b35..0412233da2b3 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -60,7 +60,7 @@ int omap_type(void) } else if (cpu_is_omap34xx()) { val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); } else if (cpu_is_omap44xx()) { - val = omap_ctrl_readl(OMAP44XX_CONTROL_STATUS); + val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS); } else { pr_err("Cannot detect omap type!\n"); goto out; |