diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 12:27:21 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-08 12:29:20 -0500 |
| commit | 5db45002576f7d60c5bf7b23e277845cd3e806be (patch) | |
| tree | 18cf276c8c0d64c5011784b814db586c0d5476cb /arch/arm/Kconfig | |
| parent | 7135466151f0560604c2bfc4c27ff9cc2a40f8cd (diff) | |
| parent | ba62a8593d15f3f353acdc8ab32c18dd40a275bb (diff) | |
Merge branch 'at91/cleanup5' into next/drivers
The at91 cleanups changed a lot of files, this merges in the
latest cleanups to resolve the conflicts
Conflicts:
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/clock.c
arch/arm/mach-at91/clock.h
drivers/rtc/Kconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 77f8ca5cc3e6..643567258f92 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -376,10 +376,11 @@ config ARCH_AT91 | |||
| 376 | select IRQ_DOMAIN | 376 | select IRQ_DOMAIN |
| 377 | select NEED_MACH_IO_H if PCCARD | 377 | select NEED_MACH_IO_H if PCCARD |
| 378 | select PINCTRL | 378 | select PINCTRL |
| 379 | select PINCTRL_AT91 if USE_OF | 379 | select PINCTRL_AT91 |
| 380 | select USE_OF | ||
| 380 | help | 381 | help |
| 381 | This enables support for systems based on Atmel | 382 | This enables support for systems based on Atmel |
| 382 | AT91RM9200 and AT91SAM9* processors. | 383 | AT91RM9200, AT91SAM9 and SAMA5 processors. |
| 383 | 384 | ||
| 384 | config ARCH_CLPS711X | 385 | config ARCH_CLPS711X |
| 385 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" | 386 | bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" |