aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/id.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-03-15 11:50:27 -0400
committerArnd Bergmann <arnd@arndb.de>2012-03-15 11:51:06 -0400
commitf82989bde1cfa5e2b4614d8e4896d795dae418d9 (patch)
tree970cd7c833fad85acbf00be335b0ae8c4991b375 /arch/arm/mach-omap2/id.c
parent695d82fae9160406acb9de204c471248abcc2a9f (diff)
parent30c766bdeccf945615097ca185326c1d7199f023 (diff)
Merge branch 'fixes' of git://gitorious.org/linux-davinci/linux-davinci into next/fixes-non-critical
* 'fixes' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits) ARM: davinci: DA850: move da850_register_pm to .init.text ARM: davinci: cpufreq: fix compiler warning (update to v3.3-rc7) Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
-rw-r--r--arch/arm/mach-omap2/id.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 134739751107..613e2c1eeb2f 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -345,6 +345,7 @@ static void __init omap3_check_revision(const char **cpu_rev)
345 case 0xb944: 345 case 0xb944:
346 omap_revision = AM335X_REV_ES1_0; 346 omap_revision = AM335X_REV_ES1_0;
347 *cpu_rev = "1.0"; 347 *cpu_rev = "1.0";
348 break;
348 case 0xb8f2: 349 case 0xb8f2:
349 switch (rev) { 350 switch (rev) {
350 case 0: 351 case 0: