diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 07:09:19 +0100 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-03-20 07:13:50 +0100 |
| commit | 17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9 (patch) | |
| tree | a45f944e15a2600ec20ca4ec11b23d4641095e8e /arch/arm/mach-shmobile/Kconfig | |
| parent | Video: atmel: avoid the id of fix screen info is overwritten (diff) | |
| parent | Doc/DT: Add DT binding documentation for tpd12s015 encoder (diff) | |
| download | linux-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.tar.xz linux-17d5ca91cfc59ae91da5ff9da74ab09a9a2a17d9.zip | |
Merge branch '3.15/dss-dt' into 3.15/fbdev
Merge OMAP DSS DT support
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 338640631e08..05fa505df585 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -8,7 +8,7 @@ config ARCH_SHMOBILE_MULTI select CPU_V7 select GENERIC_CLOCKEVENTS select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_ARM_TWD if SMP select HAVE_SMP select ARM_GIC select MIGHT_HAVE_CACHE_L2X0 |