diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:58 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-16 22:27:58 -0500 |
| commit | d05f06e60df4f56a70fb8a3e46335b40687169e9 (patch) | |
| tree | c1eec6749fed86a21b08606e1e4acefe4b033253 /arch/arm/mach-at91/Kconfig | |
| parent | 0af1c5300db31f25a412e6e83d42b1747d56c9de (diff) | |
| parent | 1d72d9f83df057e71c7951def41138a0230bf737 (diff) | |
Merge branch 'arch-frv' into no-rebases
Diffstat (limited to 'arch/arm/mach-at91/Kconfig')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index b14207101938..043624219b55 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -21,19 +21,13 @@ config SOC_AT91SAM9 | |||
| 21 | bool | 21 | bool |
| 22 | select CPU_ARM926T | 22 | select CPU_ARM926T |
| 23 | select GENERIC_CLOCKEVENTS | 23 | select GENERIC_CLOCKEVENTS |
| 24 | select MULTI_IRQ_HANDLER | ||
| 25 | select SPARSE_IRQ | ||
| 24 | 26 | ||
| 25 | menu "Atmel AT91 System-on-Chip" | 27 | menu "Atmel AT91 System-on-Chip" |
| 26 | 28 | ||
| 27 | comment "Atmel AT91 Processor" | 29 | comment "Atmel AT91 Processor" |
| 28 | 30 | ||
| 29 | config SOC_AT91SAM9 | ||
| 30 | bool | ||
| 31 | select AT91_SAM9_SMC | ||
| 32 | select AT91_SAM9_TIME | ||
| 33 | select CPU_ARM926T | ||
| 34 | select MULTI_IRQ_HANDLER | ||
| 35 | select SPARSE_IRQ | ||
| 36 | |||
| 37 | config SOC_AT91RM9200 | 31 | config SOC_AT91RM9200 |
| 38 | bool "AT91RM9200" | 32 | bool "AT91RM9200" |
| 39 | select CPU_ARM920T | 33 | select CPU_ARM920T |