Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93686ae8 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4d9c377c

arch/arm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.