summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Young <sean@mess.org>2017-11-02 21:44:21 +0100
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-12-14 16:35:24 +0100
commitaefb5e3434db4a98f30fee460b0d8885aad0f456 (patch)
tree6f4085d8e3def80aecb7d00ab2304729d6317eb2
parentmedia: rc: move ir-lirc-codec.c contents into lirc_dev.c (diff)
downloadlinux-aefb5e3434db4a98f30fee460b0d8885aad0f456.tar.xz
linux-aefb5e3434db4a98f30fee460b0d8885aad0f456.zip
media: rc: include <uapi/linux/lirc.h> rather than <media/lirc.h>
This removes the need for include/media/lirc.h, which just includes the uapi file. Signed-off-by: Sean Young <sean@mess.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
-rw-r--r--drivers/media/rc/lirc_dev.c2
-rw-r--r--include/media/lirc.h1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 97d60f0b5836..8a0e9f74329a 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -26,7 +26,7 @@
#include <linux/wait.h>
#include "rc-core-priv.h"
-#include <media/lirc.h>
+#include <uapi/linux/lirc.h>
#define LOGHEAD "lirc_dev (%s[%d]): "
#define LIRCBUF_SIZE 256
diff --git a/include/media/lirc.h b/include/media/lirc.h
deleted file mode 100644
index 554988c860c1..000000000000
--- a/include/media/lirc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <uapi/linux/lirc.h>