Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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>
David Brownell 17 years ago
parent
4d9c377c81
commit
93686ae835
1 changed files with 1 additions and 1 deletions
Unified View Show Diff Stats
  1. 1 1
      arch/arm/Kconfig

+ 1 - 1
arch/arm/Kconfig
View File 

@@ -234,6 +234,7 @@ config ARCH_VERSATILE
 
 config ARCH_AT91
 
 config ARCH_AT91
 
 	bool "Atmel AT91"
 
 	bool "Atmel AT91"
 
 	select GENERIC_GPIO
 
 	select GENERIC_GPIO
 
+	select HAVE_CLK
 
 	help
 
 	help
 
 	  This enables support for systems based on the Atmel AT91RM9200,
 
 	  This enables support for systems based on the Atmel AT91RM9200,
 
 	  AT91SAM9 and AT91CAP9 processors.
 
 	  AT91SAM9 and AT91CAP9 processors.
 
@@ -267,7 +268,6 @@ config ARCH_EP93XX
 
 	select ARM_VIC
 
 	select ARM_VIC
 
 	select GENERIC_GPIO
 
 	select GENERIC_GPIO
 
 	select HAVE_CLK
 
 	select HAVE_CLK
 
-	select HAVE_CLK
 
 	select ARCH_REQUIRE_GPIOLIB
 
 	select ARCH_REQUIRE_GPIOLIB
 
 	help
 
 	help
 
 	  This enables support for the Cirrus EP93xx series of CPUs.
 
 	  This enables support for the Cirrus EP93xx series of CPUs.