diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 09:43:21 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 09:43:21 -0400 |
| commit | 0e896b1ddc1905df904df98c204bacf028219729 (patch) | |
| tree | dc1965765c0a55e1260c4c3956db4ae2b23cc235 /arch/arm/Kconfig | |
| parent | 48b9bf0953867d4fb21f44d8c1a061b5358fe53b (diff) | |
| parent | 0573a2bb885848af67127b77dbebb900d0ae19b9 (diff) | |
Merge branch 'clps711x/cleanup' into next/cleanup
* clps711x/cleanup:
ARM: clps711x: Cleanup IRQ handling
ARM clps711x: Removed unused header mach/time.h
ARM: clps711x: Added note about support EP731x CPU to Kconfig
ARM: clps711x: Added missing register definitions
ARM: clps711x: Used own subarch directory for store header file
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cece19202c6b..b5a696fc0a58 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -373,12 +373,12 @@ config ARCH_HIGHBANK | |||
| 373 | Support for the Calxeda Highbank SoC based boards. | 373 | Support for the Calxeda Highbank SoC based boards. |
| 374 | 374 | ||
| 375 | config ARCH_CLPS711X | 375 | config ARCH_CLPS711X |
| 376 | bool "Cirrus Logic CLPS711x/EP721x-based" | 376 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" |
| 377 | select CPU_ARM720T | 377 | select CPU_ARM720T |
| 378 | select ARCH_USES_GETTIMEOFFSET | 378 | select ARCH_USES_GETTIMEOFFSET |
| 379 | select NEED_MACH_MEMORY_H | 379 | select NEED_MACH_MEMORY_H |
| 380 | help | 380 | help |
| 381 | Support for Cirrus Logic 711x/721x based boards. | 381 | Support for Cirrus Logic 711x/721x/731x based boards. |
| 382 | 382 | ||
| 383 | config ARCH_CNS3XXX | 383 | config ARCH_CNS3XXX |
| 384 | bool "Cavium Networks CNS3XXX family" | 384 | bool "Cavium Networks CNS3XXX family" |