summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Brownell <dbrownell@users.sourceforge.net>2008-07-28 15:46:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 16:30:20 -0700
commit93686ae8357c1b1e37e8dfc96547f807e7a93b4b (patch)
tree7b3040b43cbf78d946538ebab8fb3b158a4d4d64 /arch
parent4d9c377c81d37740b25cacf025f95c084eafabbb (diff)
downloadop-kernel-dev-93686ae8357c1b1e37e8dfc96547f807e7a93b4b.zip
op-kernel-dev-93686ae8357c1b1e37e8dfc96547f807e7a93b4b.tar.gz
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig2
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.
OpenPOWER on IntegriCloud