diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:25:47 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:25:47 +0100 |
| commit | a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d (patch) | |
| tree | ff2025ad147593b78b6b93b13727021a8ccc6a56 /arch/arm/mach-nspire/Kconfig | |
| parent | 9ad2a24f370159c350e9ec5dd3b91a1f3d76234e (diff) | |
| parent | 4b8b5f25b7485eaf60a40f68451b3b7b741eef59 (diff) | |
Merge branch 'cleanup/kconfig' into next/drivers
This resolves a conflict between the new sti reset
controller driver and the Kconfig cleanup.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-nspire/Kconfig')
| -rw-r--r-- | arch/arm/mach-nspire/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/mach-nspire/Kconfig b/arch/arm/mach-nspire/Kconfig index 59d8f0a70919..bc41f26c1a12 100644 --- a/arch/arm/mach-nspire/Kconfig +++ b/arch/arm/mach-nspire/Kconfig @@ -3,14 +3,9 @@ config ARCH_NSPIRE depends on ARCH_MULTI_V4_V5 depends on MMU select CPU_ARM926T - select COMMON_CLK - select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP - select SPARSE_IRQ select ARM_AMBA select ARM_VIC select ARM_TIMER_SP804 - select USE_OF - select CLKSRC_OF help This enables support for systems using the TI-NSPIRE CPU |