Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2192822iof; Tue, 7 Jun 2022 22:45:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxkyB2MKlX/lY6nXNAFpDPaybxrP7OqCfQm9ETsgFPWJG/N1ivz1BekdcVHi7SWbFYD7P4n X-Received: by 2002:a17:90a:4cc2:b0:1dd:1010:d10d with SMTP id k60-20020a17090a4cc200b001dd1010d10dmr70692150pjh.205.1654667148834; Tue, 07 Jun 2022 22:45:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654667148; cv=none; d=google.com; s=arc-20160816; b=yl1sLA6Okt+z1BT31PDUKbEmq5zloOONCMLueJVVJKPpDVLqD7EPlBu5LgTPg5oQFa WOdq1AwzMHa9AE0ySSTenv2atdHOCJAarpPJ8MUxJADeJw7UVuAhxONbeIyv0AdPOsff SFcID9QIfT4CnoKCY3Sr1tguT8VU61G7kijzVlaIFfcF3G4t9oFDa7aOMTGUZMdrHYvL dWi/JGnznA5zmozkjG+i9FR0LvD+oSPNenn3SwfJpyGmXBtB1hkhUhfc+LHv4d3vDuNl 8Q1XAsy07umV1ytuzBfDTWt4GoDH8nNn9nuMvcq1gwEdBp7gXXdqtrWF9JVpwzhnQyS9 2bVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AJ+m/3bNR+2IiW3p+rXg5mhrcsuDXthhSrYISLPU5Uo=; b=o673wR3Hd8msQDblFoRK5g1m0xk8jiTqfEVY6rkVAJfukLjyDNqDMGOsyCplC3MzhM ICw+aGvHBuRA493dUsZ7ZEqpLsGK/cAxRqoc9KcVn6t3dpMdqeiuUDGZSeqHxnbWRMdL A92DLeCAaA8mRF/1DDguQI2Q8Ya4dQ2NleWAmt3Ae9b4piGBTicIsftlmHm+DmWY/1Ri yN7K2xOSLMMsyU8TigJy/26/nsngDUcOpJlpE+7xQ4r2FGxo74S8xvifQwuOACuO9Owm tDlXr/iO0fxBy/uuYM7HFjaRvEeN2dJ+D63v+8mASngzhU+f/KP5kw8Z+ontgjm2t/mJ Azpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PrV7EgEi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id j14-20020a63ec0e000000b003c6aa1dce5fsi26438700pgh.872.2022.06.07.22.45.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:45:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=PrV7EgEi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4D7C83CC8BB; Tue, 7 Jun 2022 22:10:41 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1386527AbiFHAWX (ORCPT + 99 others); Tue, 7 Jun 2022 20:22:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382920AbiFGVwF (ORCPT ); Tue, 7 Jun 2022 17:52:05 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6AC023F7F6; Tue, 7 Jun 2022 12:10:03 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 24722B823B1; Tue, 7 Jun 2022 19:10:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AABFC385A5; Tue, 7 Jun 2022 19:10:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654629000; bh=MUUEaXe42oEIFdsTF9pziCgPfvLKsA9Oo5uJ3FOrQY4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PrV7EgEi6jACndLdjFSuzYVQeKl7J9/czNtPpdNcnFkOC1HE9kwKsKQwwKVbvfTg1 ZS4sVm2gOzc9/yc4Pmhym6Er1Rgr43XN0bOiCjr15UyboPBZQuLE+83XjqcmbV0Q/D z7/JTUZ6+H6I1S8zTAKnc5Tt1X9Lffj6ZKUc0pcA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Slaby , Mauro Carvalho Chehab , Sean Young , Linus Torvalds , Sasha Levin Subject: [PATCH 5.18 532/879] media: lirc: revert removal of unused feature flags Date: Tue, 7 Jun 2022 19:00:50 +0200 Message-Id: <20220607165018.315716427@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Young [ Upstream commit e5499dd7253c8382d03f687f19a854adcc688357 ] 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. Fixes: b2a90f4fcb14 ("media: lirc: remove unused lirc features") Link: https://lore.kernel.org/all/a0470450-ecfd-2918-e04a-7b57c1fd7694@kernel.org/ Reported-by: Jiri Slaby Cc: Mauro Carvalho Chehab Signed-off-by: Sean Young Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- include/uapi/linux/lirc.h | 7 +++++++ 1 file changed, 7 insertions(+) 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) -- 2.35.1