lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'omap4_and_sdrc_2.6.27' of git://git.pwsan.com/linux-2.6 into omap-for-linus

Browse Source
This commit is contained in:
Tony Lindgren
2010-09-27 13:17:13 -07:00
parent 6e457bb05c a3fed9bc18
commit 91f6c90c8d
18 changed files with 4634 additions and 1917 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/id.c
View File

@@ -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;