diff mbox series

media: lirc: revert removal of unused feature flags

Message ID Yo4qTnYYT+55vlQ9@gofer.mess.org (mailing list archive)
State Accepted
Delegated to: Sean Young
Headers
Series media: lirc: revert removal of unused feature flags |

Commit Message

Sean Young May 25, 2022, 1:08 p.m. UTC 
  commit b2a90f4fcb14 ("media: lirc: remove unused lirc features") removed
feature flags which were never implemented, but they are still used by
the lirc daemon went built from source.

Reinstate these symbols in order not to break the lirc build.

Cc: Jiri Slaby <jirislaby@kernel.org>
Link: https://lkml.org/lkml/2022/5/25/58
Fixes: b2a90f4fcb14 ("media: lirc: remove unused lirc features")
Signed-off-by: Sean Young <sean@mess.org>
---
 include/uapi/linux/lirc.h | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Linus Torvalds May 25, 2022, 4:53 p.m. UTC | #1 
On Wed, May 25, 2022 at 6:08 AM Sean Young <sean@mess.org> wrote:
>
> commit b2a90f4fcb14 ("media: lirc: remove unused lirc features") removed
> feature flags which were never implemented, but they are still used by
> the lirc daemon went built from source.
>
> Reinstate these symbols in order not to break the lirc build.

Applied directly to my tree. Thanks,

                  Linus
Jiri Slaby May 26, 2022, 9:01 a.m. UTC | #2 
On 25. 05. 22, 18:53, Linus Torvalds wrote:
> On Wed, May 25, 2022 at 6:08 AM Sean Young <sean@mess.org> wrote:
>>
>> commit b2a90f4fcb14 ("media: lirc: remove unused lirc features") removed
>> feature flags which were never implemented, but they are still used by
>> the lirc daemon went built from source.
>>
>> Reinstate these symbols in order not to break the lirc build.
> 
> Applied directly to my tree. Thanks,

Works for me, thanks.
diff mbox series

Patch

diff --git a/include/uapi/linux/lirc.h b/include/uapi/linux/lirc.h
index 23b0f2c8ba81..8d7ca7c6af42 100644
--- a/include/uapi/linux/lirc.h
+++ b/include/uapi/linux/lirc.h
@@ -84,6 +84,13 @@ 
 #define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
 #define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
 
+/*
+ * Unused features. These features were never implemented, in tree or
+ * out of tree. These definitions are here so not to break the lircd build.
+ */
+#define LIRC_CAN_SET_REC_FILTER		0
+#define LIRC_CAN_NOTIFY_DECODE		0
+
 /*** IOCTL commands for lirc driver ***/
 
 #define LIRC_GET_FEATURES              _IOR('i', 0x00000000, __u32)