update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/pci/ivtv/ivtv-cards.h
..
..
@@ -1,21 +1,9 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
     Functions to query card hardware
3
4
     Copyright (C) 2003-2004  Kevin Thayer <nufan_wfk at yahoo.com>
4
5
     Copyright (C) 2005-2007  Hans Verkuil <hverkuil@xs4all.nl>
5
6
 
6
-    This program is free software; you can redistribute it and/or modify
7
-    it under the terms of the GNU General Public License as published by
8
-    the Free Software Foundation; either version 2 of the License, or
9
-    (at your option) any later version.
10
-
11
-    This program is distributed in the hope that it will be useful,
12
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
13
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14
-    GNU General Public License for more details.
15
-
16
-    You should have received a copy of the GNU General Public License
17
-    along with this program; if not, write to the Free Software
18
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19
7
  */
20
8
 
21
9
 #ifndef IVTV_CARDS_H
..
..
@@ -168,8 +156,7 @@
168
156
 #define IVTV_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \
169
157
 			  V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | V4L2_CAP_VBI_CAPTURE | \
170
158
 			  V4L2_CAP_SLICED_VBI_CAPTURE)
171
-#define IVTV_CAP_DECODER (V4L2_CAP_VIDEO_OUTPUT | \
172
-			  V4L2_CAP_SLICED_VBI_OUTPUT | V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
159
+#define IVTV_CAP_DECODER (V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_SLICED_VBI_OUTPUT)
173
160
 
174
161
 struct ivtv_card_video_input {
175
162
 	u8  video_type;		/* video input type */