Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

David Brownell and committed by
Linus Torvalds
93686ae8 4d9c377c

+1 -1
+1 -1
arch/arm/Kconfig
··· 234 234 config ARCH_AT91 235 235 bool "Atmel AT91" 236 236 select GENERIC_GPIO 237 + select HAVE_CLK 237 238 help 238 239 This enables support for systems based on the Atmel AT91RM9200, 239 240 AT91SAM9 and AT91CAP9 processors. ··· 267 266 select ARM_AMBA 268 267 select ARM_VIC 269 268 select GENERIC_GPIO 270 - select HAVE_CLK 271 269 select HAVE_CLK 272 270 select ARCH_REQUIRE_GPIOLIB 273 271 help