summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Michl <ladis@linux-mips.org>2017-10-05 09:11:06 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2017-10-05 10:16:21 -0300
commitc1301077213d4dca34f01fc372b64d3c4a49a437 (patch)
tree5dbf749d4e5f83675d3533e0d57e5f3a3acb47f9
parentccec44cc910d1fa94690e0b9f07194be3421cb1a (diff)
downloadlinux-c1301077213d4dca34f01fc372b64d3c4a49a437.tar.gz
linux-c1301077213d4dca34f01fc372b64d3c4a49a437.tar.bz2
linux-c1301077213d4dca34f01fc372b64d3c4a49a437.zip
[media] media: rc: fix gpio-ir-receiver build failure
The 0-day robot reports: drivers/media/rc/gpio-ir-recv.c: In function 'gpio_ir_recv_irq': >> drivers/media/rc/gpio-ir-recv.c:38:8: error: implicit declaration of function 'gpiod_get_value' [-Werror=implicit-function-declaration] Fixes: eed008e605d1 ("[media] media: rc: gpio-ir-recv: use gpiolib API") For some reason only partial patch was applied. Also include gpio/consumer.h otherwise compile test fails. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Acked-by: Sean Young <sean@mess.org>
-rw-r--r--drivers/media/rc/Kconfig1
-rw-r--r--drivers/media/rc/gpio-ir-recv.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 467cf2bdbd42..451cba1fe9bf 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -392,6 +392,7 @@ config RC_LOOPBACK
config IR_GPIO_CIR
tristate "GPIO IR remote control"
depends on RC_CORE
+ depends on (OF && GPIOLIB) || COMPILE_TEST
---help---
Say Y if you want to use GPIO based IR Receiver.
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 24641a9079da..3d99b51384ac 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -14,7 +14,7 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/interrupt.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_gpio.h>