diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-11-28 16:15:14 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 16:15:14 +0100 |
| commit | e155aee2b279b099da5c5cfd6df5795e7388ece1 (patch) | |
| tree | 36c4469f2e86ea0e2f12ffa54ee78bfb56ba3d06 /drivers/misc | |
| parent | ARM: vexpress: Remove non-DT code (diff) | |
| parent | ARM: at91/Kconfig: remove useless fbdev Kconfig options (diff) | |
| download | linux-dev-e155aee2b279b099da5c5cfd6df5795e7388ece1.tar.xz linux-dev-e155aee2b279b099da5c5cfd6df5795e7388ece1.zip | |
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup
Pull "Third batch of cleanup/SoC for 3.19" from Nicolas Ferre:
- fixes following legacy board removal
- removal of legacy board support for at91sam9263, at91sam9260/at91sam9g20
and at91sam9261/at91sam9g10 SoCs families. Please use DT now.
- removal of some now useless Kconfig options
* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/Kconfig: remove useless fbdev Kconfig options
ARM: at91: remove at91sam9261/at91sam9g10 legacy board support
ARM: at91/Kconfig: remove unused config options
ARM: at91: remove at91sam9260/at91sam9g20 legacy board support
ARM: at91: remove at91sam9260/at91sam9g20 legacy boards files
ARM: at91: remove at91sam9263 legacy board support
ARM: at91/at91sam9g45: remove useless header file
Conflicts:
arch/arm/mach-at91/at91sam9g45.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index bbeb4516facf..006242c8bca0 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -75,7 +75,7 @@ config ATMEL_TCB_CLKSRC config ATMEL_TCB_CLKSRC_BLOCK int depends on ATMEL_TCB_CLKSRC - prompt "TC Block" if ARCH_AT91RM9200 || ARCH_AT91SAM9260 || CPU_AT32AP700X + prompt "TC Block" if CPU_AT32AP700X default 0 range 0 1 help |