diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-04-13 08:57:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-04-13 08:57:03 +0200 |
commit | 889fac6d67d46a5e781c08fb26fec9016db1c307 (patch) | |
tree | 7e01d04928f7ce343afff5b77ba13c2f3d083326 /drivers/pwm/Kconfig | |
parent | Merge tag 'perf-core-for-mingo-20160401' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | Linux 4.6-rc3 (diff) | |
download | linux-889fac6d67d46a5e781c08fb26fec9016db1c307.tar.xz linux-889fac6d67d46a5e781c08fb26fec9016db1c307.zip |
Merge tag 'v4.6-rc3' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pwm/Kconfig')
-rw-r--r-- | drivers/pwm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 8cf0dae78555..c182efc62c7b 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -316,7 +316,7 @@ config PWM_RCAR config PWM_RENESAS_TPU tristate "Renesas TPU PWM support" - depends on ARCH_SHMOBILE || COMPILE_TEST + depends on ARCH_RENESAS || COMPILE_TEST depends on HAS_IOMEM help This driver exposes the Timer Pulse Unit (TPU) PWM controller found |