summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc/Kconfig
diff options
context:
space:
mode:
authorIvaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>2016-06-22 21:22:17 +0200
committerTony Lindgren <tony@atomide.com>2016-06-30 06:46:31 +0200
commit4406d52a0b735b27472846953fd0565302af6f3c (patch)
treec253a8a108123f85f2df0c4077656bf01e8bf668 /drivers/media/rc/Kconfig
parentLinux 4.7-rc1 (diff)
downloadlinux-4406d52a0b735b27472846953fd0565302af6f3c.tar.xz
linux-4406d52a0b735b27472846953fd0565302af6f3c.zip
ir-rx51: Fix build after multiarch changes broke it
The ir-rx51 driver for n900 has been disabled since the multiarch changes as plat include directory no longer is SoC specific. Let's fix it with minimal changes to pass the dmtimer calls in pdata. Then the following changes can be done while things can be tested to be working for each change: 1. Change the non-pwm dmtimer to use just hrtimer if possible 2. Change the pwm dmtimer to use Linux PWM API with the new drivers/pwm/pwm-omap-dmtimer.c and remove the direct calls to dmtimer functions 3. Parse configuration from device tree and drop the pdata Cc: Mauro Carvalho Chehab <mchehab@osg.samsung.com> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: linux-media@vger.kernel.org Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com> Acked-by: Pavel Machek <pavel@ucw.cz> Acked-by: Pali Rohár <pali.rohar@gmail.com>
Diffstat (limited to 'drivers/media/rc/Kconfig')
-rw-r--r--drivers/media/rc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index bd4d68500085..370e16e07867 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -336,7 +336,7 @@ config IR_TTUSBIR
config IR_RX51
tristate "Nokia N900 IR transmitter diode"
- depends on OMAP_DM_TIMER && ARCH_OMAP2PLUS && LIRC && !ARCH_MULTIPLATFORM
+ depends on OMAP_DM_TIMER && PWM_OMAP_DMTIMER && ARCH_OMAP2PLUS && LIRC
---help---
Say Y or M here if you want to enable support for the IR
transmitter diode built in the Nokia N900 (RX51) device.