Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=93686a...
Commit:     93686ae8357c1b1e37e8dfc96547f807e7a93b4b
Parent:     4d9c377c81d37740b25cacf025f95c084eafabbb
Author:     David Brownell <dbrownell@users.sourceforge.net>
AuthorDate: Mon Jul 28 15:46:22 2008 -0700
Committer:  Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Mon Jul 28 16:30:20 2008 -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>
---
 arch/arm/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c8f5282..ea5eb5f 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -234,6 +234,7 @@ config ARCH_VERSATILE
 config ARCH_AT91
 	bool "Atmel AT91"
 	select GENERIC_GPIO
+	select HAVE_CLK
 	help
 	  This enables support for systems based on the Atmel AT91RM9200,
 	  AT91SAM9 and AT91CAP9 processors.
@@ -267,7 +268,6 @@ config ARCH_EP93XX
 	select ARM_VIC
 	select GENERIC_GPIO
 	select HAVE_CLK
-	select HAVE_CLK
 	select ARCH_REQUIRE_GPIOLIB
 	help
 	  This enables support for the Cirrus EP93xx series of CPUs.
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html