diff options
author | SAN People <andrew@sanpeople.com> | 2006-01-09 12:05:41 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-09 12:05:41 -0500 |
commit | 73a59c1c4af06c675a168d698d3ebfbb3270ddbe (patch) | |
tree | fa1708e19cf89a6bd13c8f7725a9cc67cc4ae6fd /arch/arm/Kconfig | |
parent | 50365c57860cd931c2d806057e0987634797e9af (diff) |
[ARM] 3240/2: AT91RM9200 support for 2.6 (Core)
Patch from SAN People
Following changes were made to clock.c:
1) Replaced <asm/hardware/clock.h> with <linux/clk.h>
2) Removed old unused clk_enable & clk_disable.
3) Replaced clk_use/clk_unuse with clk_enable/clk_disable.
Otherwise it's the same as the previous patch.
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 70f388d168db..e149f152e70b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -210,6 +210,12 @@ config ARCH_AAEC2000 | |||
210 | help | 210 | help |
211 | This enables support for systems based on the Agilent AAEC-2000 | 211 | This enables support for systems based on the Agilent AAEC-2000 |
212 | 212 | ||
213 | config ARCH_AT91RM9200 | ||
214 | bool "AT91RM9200" | ||
215 | help | ||
216 | Say Y here if you intend to run this kernel on an AT91RM9200-based | ||
217 | board. | ||
218 | |||
213 | endchoice | 219 | endchoice |
214 | 220 | ||
215 | source "arch/arm/mach-clps711x/Kconfig" | 221 | source "arch/arm/mach-clps711x/Kconfig" |
@@ -248,6 +254,8 @@ source "arch/arm/mach-aaec2000/Kconfig" | |||
248 | 254 | ||
249 | source "arch/arm/mach-realview/Kconfig" | 255 | source "arch/arm/mach-realview/Kconfig" |
250 | 256 | ||
257 | source "arch/arm/mach-at91rm9200/Kconfig" | ||
258 | |||
251 | # Definitions to make life easier | 259 | # Definitions to make life easier |
252 | config ARCH_ACORN | 260 | config ARCH_ACORN |
253 | bool | 261 | bool |
@@ -413,7 +421,8 @@ config LEDS | |||
413 | ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ | 421 | ARCH_EBSA285 || ARCH_IMX || ARCH_INTEGRATOR || \ |
414 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ | 422 | ARCH_LUBBOCK || MACH_MAINSTONE || ARCH_NETWINDER || \ |
415 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ | 423 | ARCH_OMAP || ARCH_P720T || ARCH_PXA_IDP || \ |
416 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE | 424 | ARCH_SA1100 || ARCH_SHARK || ARCH_VERSATILE || \ |
425 | ARCH_AT91RM9200 | ||
417 | help | 426 | help |
418 | If you say Y here, the LEDs on your machine will be used | 427 | If you say Y here, the LEDs on your machine will be used |
419 | to provide useful information about your current system status. | 428 | to provide useful information about your current system status. |