From: Tony Lindgren <tony@atomide.com>
Date: Mon, 1 Feb 2010 22:30:26 +0000 (+0100)
Subject: ARM: 5911/1: ARM: Select CPU_32v6K for CPU_V7 only if ARCH_OMAP2 is not selected
X-Git-Tag: v2.6.34-rc1~241^2~1^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a28e3d977860dc760909083df625b300f695680;p=pandora-kernel.git

ARM: 5911/1: ARM: Select CPU_32v6K for CPU_V7 only if ARCH_OMAP2 is not selected

Otherwise the kernel built with both CPU_V6 and CPU_V7 will not
boot on omap2.

Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

Reading git-diff-tree failed