diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-27 07:39:43 -0500 |
| commit | 31bccbf39208133415000520c79ebe7b291786df (patch) | |
| tree | e03b799594ec22613ca2eb7382fc0a98e0cd4b0f /arch/arm/Kconfig | |
| parent | e902be56cbf2a48d96d11d6884767e638d41c712 (diff) | |
| parent | 635f0258e5ae526034486b4ae9020e64bfb7d27e (diff) | |
Merge branch 'clps7500' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a04199771730..29759cd25553 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -247,16 +247,6 @@ config ARCH_AT91 | |||
| 247 | This enables support for systems based on the Atmel AT91RM9200, | 247 | This enables support for systems based on the Atmel AT91RM9200, |
| 248 | AT91SAM9 and AT91CAP9 processors. | 248 | AT91SAM9 and AT91CAP9 processors. |
| 249 | 249 | ||
| 250 | config ARCH_CLPS7500 | ||
| 251 | bool "Cirrus CL-PS7500FE" | ||
| 252 | select CPU_ARM710 | ||
| 253 | select TIMER_ACORN | ||
| 254 | select ISA | ||
| 255 | select NO_IOPORT | ||
| 256 | select ARCH_SPARSEMEM_ENABLE | ||
| 257 | help | ||
| 258 | Support for the Cirrus Logic PS7500FE system-on-a-chip. | ||
| 259 | |||
| 260 | config ARCH_CLPS711X | 250 | config ARCH_CLPS711X |
| 261 | bool "Cirrus Logic CLPS711x/EP721x-based" | 251 | bool "Cirrus Logic CLPS711x/EP721x-based" |
| 262 | select CPU_ARM720T | 252 | select CPU_ARM720T |