From: Jan Luebbe <jlu@pengutronix.de>
Date: Tue, 7 Aug 2012 16:29:45 +0000 (+0200)
Subject: omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
X-Git-Tag: omap-fixes-for-v3.6-rc1~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c691b5df1fcd93f2e9f65e1a8a3dd0e6fd158ea;p=pandora-kernel.git

omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected

When only ARCH_OMAP3 (or -2,-4,...) and SOC_AM33XX are selected, multi.h
doesn't set MULTI_OMAP2. In this case, cpu.h will simply define
cpu_is_omap24xx() as 1.

This causes problems for example for omap_hwmod.c:omap_hwmod_init which
checks for cpu_is_omap24xx() first, using the wrong soc_ops for AM33xx.

Fix this by defining MULTI_OMAP2 when using SOC_AM33XX together with
something else.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

Reading git-diff-tree failed