From: David Brownell <dbrownell@users.sourceforge.net>
Date: Mon, 28 Jul 2008 22:46:22 +0000 (-0700)
Subject: arm: fix HAVE_CLK merge goof
X-Git-Tag: v2.6.27-rc1~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93686ae8357c1b1e37e8dfc96547f807e7a93b4b;p=pandora-kernel.git

arm: fix HAVE_CLK merge goof

This fixes a merge goof whereby ARCH_EP93XX got the "select HAVE_CLK" line
which belongs instead with ARCH_AT91.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

Reading git-diff-tree failed