tree 7b3040b43cbf78d946538ebab8fb3b158a4d4d64
parent 4d9c377c81d37740b25cacf025f95c084eafabbb
author David Brownell <dbrownell@users.sourceforge.net> 1217285182 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217287820 -0700

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>