]> err.no Git - linux-2.6/commit
arm: fix HAVE_CLK merge goof
authorDavid Brownell <dbrownell@users.sourceforge.net>
Mon, 28 Jul 2008 22:46:22 +0000 (15:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 Jul 2008 23:30:20 +0000 (16:30 -0700)
commit93686ae8357c1b1e37e8dfc96547f807e7a93b4b
tree7b3040b43cbf78d946538ebab8fb3b158a4d4d64
parent4d9c377c81d37740b25cacf025f95c084eafabbb
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>
arch/arm/Kconfig