diff options
| author | Sebastian Reichel <sre@debian.org> | 2013-11-17 12:30:45 +0000 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2014-04-23 17:44:57 +0200 |
| commit | c0f2015a936dec73a919a0998f58c0a926685191 (patch) | |
| tree | 7cca65a902ce7b59cdd5ed7f28476e02ee800fc9 | |
| parent | e30c9e89390a1e19688356c1e6b41800ce459d2a (diff) | |
| download | linux-c0f2015a936dec73a919a0998f58c0a926685191.tar.bz2 | |
[media] ir-rx51: Fix build until dmtimer have a public API
This temporarily fixes building the Nokia N900 IR driver.
There is currently work going on putting dmtimer into
drivers/ and adding a public API. Until that has happened
this hack is needed to keep ir-rx51 compiling.
Signed-off-by: Sebastian Reichel <sre@debian.org>
| -rw-r--r-- | drivers/media/rc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/rc/ir-rx51.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig index 8fbd377e6311..1cc2f77678d4 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig @@ -301,7 +301,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 && 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. diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c index 13958220aa73..be29bd0901f1 100644 --- a/drivers/media/rc/ir-rx51.c +++ b/drivers/media/rc/ir-rx51.c @@ -27,7 +27,7 @@ #include <linux/wait.h> #include <linux/clk.h> -#include <plat/dmtimer.h> +#include "../../../arch/arm/plat-omap/include/plat/dmtimer.h" #include <media/lirc.h> #include <media/lirc_dev.h> |