diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2008-07-28 18:46:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 19:30:20 -0400 |
| commit | 93686ae8357c1b1e37e8dfc96547f807e7a93b4b (patch) | |
| tree | 7b3040b43cbf78d946538ebab8fb3b158a4d4d64 /arch/arm | |
| parent | 4d9c377c81d37740b25cacf025f95c084eafabbb (diff) | |
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/arm')
| -rw-r--r-- | arch/arm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c8f528284a94..ea5eb5f79adb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -234,6 +234,7 @@ config ARCH_VERSATILE | |||
| 234 | config ARCH_AT91 | 234 | config ARCH_AT91 |
| 235 | bool "Atmel AT91" | 235 | bool "Atmel AT91" |
| 236 | select GENERIC_GPIO | 236 | select GENERIC_GPIO |
| 237 | select HAVE_CLK | ||
| 237 | help | 238 | help |
| 238 | This enables support for systems based on the Atmel AT91RM9200, | 239 | This enables support for systems based on the Atmel AT91RM9200, |
| 239 | AT91SAM9 and AT91CAP9 processors. | 240 | AT91SAM9 and AT91CAP9 processors. |
| @@ -267,7 +268,6 @@ config ARCH_EP93XX | |||
| 267 | select ARM_VIC | 268 | select ARM_VIC |
| 268 | select GENERIC_GPIO | 269 | select GENERIC_GPIO |
| 269 | select HAVE_CLK | 270 | select HAVE_CLK |
| 270 | select HAVE_CLK | ||
| 271 | select ARCH_REQUIRE_GPIOLIB | 271 | select ARCH_REQUIRE_GPIOLIB |
| 272 | help | 272 | help |
| 273 | This enables support for the Cirrus EP93xx series of CPUs. | 273 | This enables support for the Cirrus EP93xx series of CPUs. |