From patchwork Wed Jun 21 08:08:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 9801129 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D338A600C5 for ; Wed, 21 Jun 2017 08:14:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0CA826E16 for ; Wed, 21 Jun 2017 08:14:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B43F828501; Wed, 21 Jun 2017 08:14:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3C1626E16 for ; Wed, 21 Jun 2017 08:14:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752391AbdFUINX (ORCPT ); Wed, 21 Jun 2017 04:13:23 -0400 Received: from mx2.suse.de ([195.135.220.15]:42229 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752247AbdFUIIe (ORCPT ); Wed, 21 Jun 2017 04:08:34 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id D148AAC15; Wed, 21 Jun 2017 08:08:31 +0000 (UTC) From: Johannes Thumshirn To: Hans Verkuil , Mauro Carvalho Chehab Cc: Linux Kernel Mailinglist , linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org, devel@driverdev.osuosl.org, linux-fbdev@vger.kernel.org, Andrew Morton , Johannes Thumshirn Subject: [PATCH RESEND 2/7] video: fbdev: don't use KERNEL_VERSION macro for MEDIA_REVISION Date: Wed, 21 Jun 2017 10:08:07 +0200 Message-Id: <20170621080812.6817-3-jthumshirn@suse.de> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170621080812.6817-1-jthumshirn@suse.de> References: <20170621080812.6817-1-jthumshirn@suse.de> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Don't use the KERNEL_VERSION() macro for the v4l2 capabilities, use MEDIA_REVISION instead. Signed-off-by: Johannes Thumshirn --- drivers/video/fbdev/matrox/matroxfb_base.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c index 11eb094396ae..eb92a325033c 100644 --- a/drivers/video/fbdev/matrox/matroxfb_base.c +++ b/drivers/video/fbdev/matrox/matroxfb_base.c @@ -113,6 +113,7 @@ #include #include #include +#include #ifdef CONFIG_PPC_PMAC #include @@ -1091,7 +1092,7 @@ static int matroxfb_ioctl(struct fb_info *info, strcpy(r.driver, "matroxfb"); strcpy(r.card, "Matrox"); sprintf(r.bus_info, "PCI:%s", pci_name(minfo->pcidev)); - r.version = KERNEL_VERSION(1,0,0); + r.version = MEDIA_REVISION(1, 0, 0); r.capabilities = V4L2_CAP_VIDEO_OUTPUT; if (copy_to_user(argp, &r, sizeof(r))) return -EFAULT;