diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-02-16 17:25:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-02-16 17:25:27 +0100 |
| commit | f8e1754ae9261197e41df38ee9f60a7e8a042b22 (patch) | |
| tree | 100cb3cd026be3eec1b27e8a16db692c8e18d061 /arch/arm | |
| parent | 6755d070e04210d4d9826697b6f64178a8ff41cf (diff) | |
| parent | dba9a0babdd938a51d11ae81f9c40d07ca613f43 (diff) | |
manual merge of timers/core
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 2bb4b09f079e..ad7d604ff001 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -57,6 +57,7 @@ config ARCH_R7S72100 select PM select PM_GENERIC_DOMAINS select SYS_SUPPORTS_SH_MTU2 + select RENESAS_OSTM config ARCH_R8A73A4 bool "R-Mobile APE6 (R8A73A40)" |