aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/id.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-09-27 16:17:13 -0400
committerTony Lindgren <tony@atomide.com>2010-09-27 16:17:13 -0400
commit91f6c90c8df1818a66d177e105d602c3da820919 (patch)
tree5cb1b01823dd676a07596f6153d2fc124c4691cb /arch/arm/mach-omap2/id.c
parent6e457bb05c348e196f67005876992ceb5eb0430a (diff)
parenta3fed9bc181666df6ecfe9ce34a29d48803f2310 (diff)
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.c2
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)
60 } else if (cpu_is_omap34xx()) { 60 } else if (cpu_is_omap34xx()) {
61 val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); 61 val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
62 } else if (cpu_is_omap44xx()) { 62 } else if (cpu_is_omap44xx()) {
63 val = omap_ctrl_readl(OMAP44XX_CONTROL_STATUS); 63 val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS);
64 } else { 64 } else {
65 pr_err("Cannot detect omap type!\n"); 65 pr_err("Cannot detect omap type!\n");
66 goto out; 66 goto out;